diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-01-01 15:30:48 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-01-01 15:30:48 -0800 |
| commit | df43fe9911ae414fef4112763446088ea88918bc (patch) | |
| tree | f31c7383a364380cf7ab3fee80a85e8a782c3235 /tox.ini | |
| parent | 641b74870602beb9e4657137ae22d55dd8103709 (diff) | |
| parent | 38cc76f8586ef141fdd051a97a65dc0c7e93f645 (diff) | |
Merge branch '1.15' into 1.16
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions