diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /doc-src/certinstall/index.py | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'doc-src/certinstall/index.py')
| -rw-r--r-- | doc-src/certinstall/index.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/doc-src/certinstall/index.py b/doc-src/certinstall/index.py deleted file mode 100644 index d6b1e417..00000000 --- a/doc-src/certinstall/index.py +++ /dev/null @@ -1,13 +0,0 @@ -from countershape import Page - -pages = [ - Page("webapp.html", "Using the Web App"), - Page("firefox.html", "Firefox"), - Page("osx.html", "OSX"), - Page("windows7.html", "Windows 7"), - Page("ios.html", "IOS"), - Page("ios-simulator.html", "IOS Simulator"), - Page("android.html", "Android"), - Page("java.html", "Java"), - Page("mitm.it-error.html", "Error: No proxy configured"), -] |