diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:27:59 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:27:59 -0800 |
| commit | 36b5edd82c39e6580526c7c2190671330390c984 (patch) | |
| tree | e235f14f8448b2bd0a7dedd1375ac1f58682889a /tox.ini | |
| parent | e0692f411287a814425d6835278b1c0caa91c82e (diff) | |
| parent | 3d913a973097fdff1b5834e165ff0bef737365b5 (diff) | |
Merge branch '1.18' into 2.1
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions