diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:44:37 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:44:37 -0800 |
commit | 3a68759d6f93a525d0067013c4a13f638faad9f6 (patch) | |
tree | 1432ebacc65498b8a9aa395f71c1dd1ac27a5930 /.travis.yml | |
parent | 317fec31f9cff564c7e5ba769bc0a77c7ba861a7 (diff) | |
parent | 3a4c383043635546b43920f9486c017ad8573bc3 (diff) |
Merge branch '2.0' into 2.1
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions