aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-12-29 14:56:47 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-12-29 14:56:47 +0100
commit333688b06ee029e809c2a7d10690c785e805f432 (patch)
tree20b124f2c2e33530f575fd5666394d37cbf55648 /setup.py
parent51671b22a079b49a7e208b6e67dbfc9c8d7df129 (diff)
parent55970bf0cc493b57bb08d2b10837aedc11f5ac18 (diff)
downloadmitmproxy-333688b06ee029e809c2a7d10690c785e805f432.tar.gz
mitmproxy-333688b06ee029e809c2a7d10690c785e805f432.tar.bz2
mitmproxy-333688b06ee029e809c2a7d10690c785e805f432.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 79398a18..953df2bb 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,6 @@ deps = {
"netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION),
"pyasn1>0.1.2",
"pyOpenSSL>=0.14",
- "Flask>=0.10.1",
"tornado>=4.0.2",
"configargparse>=0.9.3"
}