diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 19:56:43 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 19:56:43 -0800 |
commit | 5cad7e4df9bf53528c28c86d6dd945133ee2028e (patch) | |
tree | d92cf0462c2ccad35c45c6fcd7bbb3221a25858b /setup.py | |
parent | cd323c6cdaa8898444e2d497909f93751799f60e (diff) | |
parent | 4d95a2b7c344d4945b46020d0cbf6f548b543354 (diff) |
Merge branch '1.18' into 2.0
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions