diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2018-09-18 20:31:39 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2018-09-18 20:31:39 -0700 |
commit | 49d1a60dc0ba8e62ba80d176c6e79cda184e6cb5 (patch) | |
tree | ed6f79f66c88d40f4110c76036f4a5956e6b781c /setup.py | |
parent | 6f2d06cba1ef334072430d6269f5229a32a148e0 (diff) | |
parent | f861ef079f5078c356d40421d45c8be170ef2c7a (diff) |
Merge branch '2.1' into 2.2
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions