diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-09-15 10:57:59 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-09-15 10:57:59 -0700 |
commit | f0415f0a94a623abac889931cf02e59ef66ff3d7 (patch) | |
tree | 41ba3a65bfef229ee178585f9a07b0274bc77165 /setup.cfg | |
parent | 10eda0b1d44ef083f0151edf4fe17408babcb6d9 (diff) | |
parent | efdcfd275f163a8d96253dbf6f036e3804e165db (diff) |
Merge branch '1.16' into 1.17
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions