summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-03-13 14:15:31 -0300
committerTomás Touceda <chiiph@leap.se>2014-03-13 14:15:31 -0300
commitfa6ac24e679b0263efd2eb89ba53eeccd9ebb4d1 (patch)
tree5ddf4da7e0a7507cd8b747d2e38dc643a4aea6d6 /tox.ini
parent614c090eaeeb96f709ca840069ca5425dfc8f4d3 (diff)
parentd724a65ca08d5b1c16da1f2ce3fd0b50bd519dec (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/check-for-dns-resolution' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions