diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /doc-src/dev/index.py | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'doc-src/dev/index.py')
| -rw-r--r-- | doc-src/dev/index.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc-src/dev/index.py b/doc-src/dev/index.py index 0f2a6494..ddf100d0 100644 --- a/doc-src/dev/index.py +++ b/doc-src/dev/index.py @@ -1,8 +1,8 @@ from countershape import Page pages = [ - Page("testing.html", "Testing"), - Page("architecture.html", "Architecture"), - Page("sslkeylogfile.html", "TLS Master Secrets"), -# Page("addingviews.html", "Writing Content Views"), + Page("testing.html", "Testing"), + Page("architecture.html", "Architecture"), + Page("sslkeylogfile.html", "TLS Master Secrets"), + # Page("addingviews.html", "Writing Content Views"), ] |