diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 7cd0b19c3..c3f658ccb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,5 +1,8 @@ - 203 Aldo Cortesi + 278 Aldo Cortesi 18 Henrik Nordstrom 13 Thomas Roth + 10 Stephen Altamirano + 2 alts 1 Yuangxuan Wang 1 Henrik Nordström + 1 Felix Wolfsteller diff --git a/doc-src/_layout.html b/doc-src/_layout.html index 287bca873..c711e6dd1 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -14,7 +14,7 @@ $!nav if this.title!="docs" else ""!$ -

mitmproxy docs

+

mitmproxy 0.6 docs

diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html index a56c107b7..0404619b1 100644 --- a/doc-src/_websitelayout.html +++ b/doc-src/_websitelayout.html @@ -29,7 +29,7 @@
$!nav if this.title!="docs" else ""!$ - $!title if this.title!="docs" else "

mitmproxy docs

"!$ + $!title if this.title!="docs" else "

mitmproxy 0.6 docs

"!$ $!body!$
diff --git a/doc-src/index.py b/doc-src/index.py index 0191de3d9..451cf8d6e 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -14,7 +14,6 @@ else: ns.title = countershape.template.Template(None, "

@!this.title!@

") this.layout = countershape.Layout("_layout.html") -ns.docTitle = "mitmproxy" this.markup = markup.Markdown() ns.docMaintainer = "Aldo Cortesi" ns.docMaintainerEmail = "aldo@corte.si" diff --git a/libmproxy/version.py b/libmproxy/version.py index d0a1851ea..5a87f3390 100644 --- a/libmproxy/version.py +++ b/libmproxy/version.py @@ -1,2 +1,2 @@ -IVERSION = (0, 5) +IVERSION = (0, 6) VERSION = ".".join([str(i) for i in IVERSION])