summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-16 16:42:58 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-16 16:42:58 -0300
commit8d2ef215a548e7872821e37628b21f000bba0cd9 (patch)
tree9cdad76a72be25106bc12c10db31ce8a4e8eb3d2 /tox.ini
parent34457adc72a4a4c0b4bff4791f4329bca66162c1 (diff)
parent934b6b64a4bd1f6b3a71b6821076532412977e30 (diff)
Merge remote-tracking branch 'refs/remotes/elijah/bugfix/fwdns' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions