diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 18:17:38 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 18:17:38 -0700 |
commit | 594147d8a1039e7b99fdb01163885d9c9fdd9f3c (patch) | |
tree | 37174ed7fff060e18819473cbed5298cca40668f /MANIFEST.in | |
parent | 04f0d9fc74f6219d2932252b6ba7d835bb4914ef (diff) | |
parent | 61ce4dee94b3664b5fc5e52b221c624a5206612e (diff) |
Merge branch '2.1' into 2.2
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions