diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:06:56 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:06:56 -0800 |
commit | 1d3ce6de95ac602a1a27d9a09b5de557bee07abf (patch) | |
tree | 4c97d35a970bf2c06ff2c6a84b1fa83637bd093e /setup.cfg | |
parent | 4d95a2b7c344d4945b46020d0cbf6f548b543354 (diff) | |
parent | 594ecebef6b3158421c86a7ee139eed1b58694ce (diff) |
Merge branch '1.17' into 1.18
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions