diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-21 11:20:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-21 11:20:59 -0700 |
| commit | a6b38ff5d2f4ceae2b74ef2c3f10aab56f65fc0f (patch) | |
| tree | 81c0f07236f0b4a4da0c1a611c19353d8f3fb336 /.travis.yml | |
| parent | fe9171661a60b9299395c73630ebdbdc76fec342 (diff) | |
| parent | a749c83aa8cd47b7159d3dacebe2d62edb2b94e8 (diff) | |
Merge branch '1.12' into 1.13
Conflicts:
setup.py
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions