diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 16:12:28 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 16:12:28 -0800 |
commit | 485405212e0f9a5849d7350b1d3a8c884d7b144c (patch) | |
tree | 67101861971869483421f102ccd1f0392061d4f3 /tox-requirements.txt | |
parent | a70b78e0dfd6c0fcb01a5aeb14f0244f9596d116 (diff) | |
parent | 51cafed29a8b87f58718f55a449a8c4e499addb4 (diff) |
Merge branch '2.0' into 2.1
Diffstat (limited to 'tox-requirements.txt')
0 files changed, 0 insertions, 0 deletions