diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-28 19:26:16 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-28 19:26:16 -0700 |
| commit | 471d46d5b982ca8cc1081523ba5248535534c497 (patch) | |
| tree | 865a31cd375d442a6f72339ed5f094197b73fdfa /setup.py | |
| parent | bdf5e970e1d683d3da6d49ee1c8d90ecaf47d40e (diff) | |
| parent | c6f532425701a6f447fc6abff8c5924091f95bdf (diff) | |
Merge branch '1.15' into 1.16
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions