diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-12-14 19:31:10 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-12-14 19:31:10 -0800 |
| commit | 8be99a9692016003218558269db362be07d4c445 (patch) | |
| tree | a89157dc1d2fbd164ff29c42dadfc3d24cbfdf39 /.travis.yml | |
| parent | d591ea7d74808db19041844e27cf9d5e183b417f (diff) | |
| parent | 94a8169b1391ae8f1a9e8f4e4fad7e001c334fe8 (diff) | |
Merge branch '2.1' into 2.2
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions