diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-14 14:33:30 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-14 14:33:30 -0400 |
commit | 3f841c8087af1e573fcf6be1b05c734dda565d59 (patch) | |
tree | 48df01a66991fb805226554606b3774264268a36 /setup.cfg | |
parent | af3deabbb18d2db6c1fd073d4755f2f1b9b0135c (diff) | |
parent | 61e19a1da57e7d19959d26f71f895abd6cb0647c (diff) |
Merge branch '2.1' into 2.2
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions