diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-09-21 16:42:24 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-09-21 16:42:24 -0700 |
| commit | 00f109bb8c2836b83fbba3f828988c91c54f0b4f (patch) | |
| tree | 2b5ae0fccb2d443d6ecd64f6f5e3f753276bf14e /setup.py | |
| parent | 79441930f8e4acac2a2167a40c961e3f5e9b6257 (diff) | |
| parent | 6491644d5f1dd9962b2f71db4e763dca747f0163 (diff) | |
Merge branch '1.17' into 2.0
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions