aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-12-25 13:38:34 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-12-25 13:38:34 +0100
commit7d793ae16245cfd902a9ca9d3add38b09a4db368 (patch)
tree3d253d03b6eb41e5c29b1db4920857b3f54c1f6b
parent4cfa91a903f581856082e0ac2c009726082f23c8 (diff)
parentd0ab553bd0b891f79cd1506e577dd15d14515500 (diff)
downloadmitmproxy-7d793ae16245cfd902a9ca9d3add38b09a4db368.tar.gz
mitmproxy-7d793ae16245cfd902a9ca9d3add38b09a4db368.tar.bz2
mitmproxy-7d793ae16245cfd902a9ca9d3add38b09a4db368.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 1c3bae5d..2dc898c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,4 @@ notifications:
cache:
directories:
- /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages
- - /home/travis/virtualenv/pypy-2.4.0/site-packages \ No newline at end of file
+ - /home/travis/virtualenv/pypy-2.4.0/site-packages