aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-09-12 12:31:17 +1200
committerAldo Cortesi <aldo@nullcube.com>2014-09-12 12:31:17 +1200
commit25284792a5296e24fcfb9c10ed1be8a8c74733b2 (patch)
tree419e63ef43b8952b132a8d70241fbb58056f97ef
parentefa3e3dde82ed0675d6cb85fdeb089584621e6f2 (diff)
parentfa9c3e9fa7d072b1d875c4cf0d92418d0c5a50c3 (diff)
downloadmitmproxy-25284792a5296e24fcfb9c10ed1be8a8c74733b2.tar.gz
mitmproxy-25284792a5296e24fcfb9c10ed1be8a8c74733b2.tar.bz2
mitmproxy-25284792a5296e24fcfb9c10ed1be8a8c74733b2.zip
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a83296f1..3abf4515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ MANIFEST
*.py[cdo]
*.swp
*.swo
+mitmproxy.egg-info/
mitmproxyc
mitmdumpc
.coverage