Merge remote-tracking branch 'origin/master'

This commit is contained in:
Maximilian Hils
2013-12-11 14:05:18 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -16,7 +16,7 @@ else:
ns.title = countershape.template.Template(None, "<h1>@!this.title!@</h1>")
this.titlePrefix = "mitmproxy 0.9 - "
this.titlePrefix = "mitmproxy 0.10 - "
this.markup = markup.Markdown(extras=["footnotes"])
ns.docMaintainer = "Aldo Cortesi"