diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 22:11:14 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 22:11:14 -0700 |
commit | d7e65c2a4b78dbc8a7801bbd1826c2d2d7ab91c7 (patch) | |
tree | bdff521a7d6e69f0690fd19312b10bcd15ca3e0a /setup.py | |
parent | 8740474f4dad288632135d38ce04d268a9a8ad65 (diff) | |
parent | 6460ee41a0bfed2498b4a89652cb170783ac442d (diff) |
Merge branch '1.15' into 1.16
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions