diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-02-20 14:41:14 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-02-20 14:41:14 -0800 |
commit | a16a28afbf643b1219796f041edde05109fa2000 (patch) | |
tree | 1cc0c230c7c6750ad0de6cf363247790a8c5e935 /.travis.yml | |
parent | 4bbea1325988bb80f80113ab3a81bd5ed1ec7811 (diff) | |
parent | 5835599f0047b4ab1d2a090c058baf282a1402f7 (diff) |
Merge branch '2.0' into 2.1
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions