aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-11-11 14:02:56 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-11-11 14:02:56 +1300
commit396fb1943a7e5ffa20144a0a65836910d83563c1 (patch)
tree0e520f810c432538dbe5fece453bb5f022127e25
parent0811a9ebde4975d4e934cf4752376dd0db9bb7e4 (diff)
parent3b468849e6de501b8d04c2f8c043dd2960387dae (diff)
downloadmitmproxy-396fb1943a7e5ffa20144a0a65836910d83563c1.tar.gz
mitmproxy-396fb1943a7e5ffa20144a0a65836910d83563c1.tar.bz2
mitmproxy-396fb1943a7e5ffa20144a0a65836910d83563c1.zip
Merge branch 'merge'
-rw-r--r--test/requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/requirements.txt b/test/requirements.txt
index 89e4aa0a..b13080b4 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -2,4 +2,4 @@ mock>=1.0.1
nose>=1.3.0
nose-cov>=1.6
coveralls>=0.4.1
-pathod>=0.10 \ No newline at end of file
+pathod>=0.11