diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:07:08 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:07:08 -0700 |
| commit | d6208bf892c380f439aa01679e95bafd6c380504 (patch) | |
| tree | 76413a534ca16d9f0f17a6a21f576a4d1838c282 /setup.cfg | |
| parent | 61d1297f3c9fc1bb9e8d4f4524d287d38c56c3cf (diff) | |
| parent | b58beb4dd0211092e352fd01af0be5e6550c9db5 (diff) | |
Merge branch '2.1' into 2.2
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions