aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-02-17 00:15:58 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-02-17 00:15:58 +0100
commitb5d02add287ad606ac8eadeed30d0a4dace311a6 (patch)
treec28ec62cd7e7237a36d84cf55ad1279484e4b2ef /libmproxy
parentd9a60372997fad5d7b94abaa49c5fb73e634a208 (diff)
parent39f73776dc75cd8e08871b6f5610b2f80774c485 (diff)
downloadmitmproxy-b5d02add287ad606ac8eadeed30d0a4dace311a6.tar.gz
mitmproxy-b5d02add287ad606ac8eadeed30d0a4dace311a6.tar.bz2
mitmproxy-b5d02add287ad606ac8eadeed30d0a4dace311a6.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/version.py b/libmproxy/version.py
index 3140e03a..8df95c6e 100644
--- a/libmproxy/version.py
+++ b/libmproxy/version.py
@@ -1,4 +1,4 @@
-IVERSION = (0, 10)
+IVERSION = (0, 11)
VERSION = ".".join(str(i) for i in IVERSION)
NAME = "mitmproxy"
NAMEVERSION = NAME + " " + VERSION