diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-16 00:22:41 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-16 00:22:41 +0100 |
| commit | 615e4ec163985841b0556a3dff6fe3241d29644f (patch) | |
| tree | ff163470528edf6149e34a86419f735d13038ff2 | |
| parent | 10f9b6faa72bcd97ccb21044802288fdeab1c43c (diff) | |
| parent | d17ae31452542484c9ba8ccb705ce3cf141696d6 (diff) | |
| download | mitmproxy-615e4ec163985841b0556a3dff6fe3241d29644f.tar.gz mitmproxy-615e4ec163985841b0556a3dff6fe3241d29644f.tar.bz2 mitmproxy-615e4ec163985841b0556a3dff6fe3241d29644f.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
| -rwxr-xr-x[-rw-r--r--] | dev.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mitmproxy/mitmproxy | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mitmproxy/mitmweb | 0 | ||||
| -rw-r--r-- | mitmproxy/setup.py | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/mitmproxy b/mitmproxy/mitmproxy index b7c5c94e..b7c5c94e 100644..100755 --- a/mitmproxy/mitmproxy +++ b/mitmproxy/mitmproxy diff --git a/mitmproxy/mitmweb b/mitmproxy/mitmweb index d709811b..d709811b 100644..100755 --- a/mitmproxy/mitmweb +++ b/mitmproxy/mitmweb diff --git a/mitmproxy/setup.py b/mitmproxy/setup.py index 004656cc..23327553 100644 --- a/mitmproxy/setup.py +++ b/mitmproxy/setup.py @@ -79,7 +79,7 @@ setup( # Do not use a range operator here: https://bitbucket.org/pypa/setuptools/issues/380 # Ubuntu Trusty and other still ship with setuptools < 17.1 ':python_version == "2.7"': [ - "enum34>=1.0.4, <1.2", + "enum34>=1.0.4, <1.1", ], 'dev': [ "mock>=1.3.0, <1.4", |