summaryrefslogtreecommitdiffhomepage
path: root/tox.ini
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-09-30 14:18:26 -0700
committerJeff Forcier <jeff@bitprophet.org>2015-09-30 14:18:26 -0700
commit977c237d711b27b10ee29f960c270c80956cc291 (patch)
tree40077c14c840d1a32e487f8692765f3584045e68 /tox.ini
parentd705c848853694de8630250f8d5913a0f9648ac2 (diff)
parentfb258f88b4b61627a51f30f9a21fcbc7ec35c1e6 (diff)
Merge branch '1.15'
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions