diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:34:13 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:34:13 -0700 |
| commit | ac6aad79da050ce65f0be085a8379338c41d4386 (patch) | |
| tree | 5534ee2138b0ee0478eac1d4f91f97a16f8aa715 /setup.cfg | |
| parent | 2deecdf886a91792e47164dd9e39634ba9c65735 (diff) | |
| parent | 85adfc8ef34b30231258a32a1d0151124b5427d6 (diff) | |
Merge branch '2.1' into 2.2
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions