diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 19:56:29 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 19:56:29 -0800 |
| commit | 4d95a2b7c344d4945b46020d0cbf6f548b543354 (patch) | |
| tree | 286ec3ccc2e1e5f7bf04e92916b3d1183c241e9a /setup.cfg | |
| parent | 8f247e48a789dae73877a7b9ac7066dcbc3d4a9e (diff) | |
| parent | 9c3e555001c5f670bd4d48dd6d6f529c1812d3f6 (diff) | |
Merge branch '1.17' into 1.18
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions