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/mitm.it-error.html | |
| 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/mitm.it-error.html')
| -rw-r--r-- | doc-src/certinstall/mitm.it-error.html | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/doc-src/certinstall/mitm.it-error.html b/doc-src/certinstall/mitm.it-error.html deleted file mode 100644 index 6ddc1789..00000000 --- a/doc-src/certinstall/mitm.it-error.html +++ /dev/null @@ -1,5 +0,0 @@ -**Looks like you wanted to install the mitmproxy CA using the web app?** - -Unfortunately, there's been no mitmproxy instance on the wire that could have intercepted your request. -Please configure your client to use mitmproxy and try again.<br> -The request to <a href="http://mitm.it/">http://mitm.it/</a> must go through your mitmproxy instance.
\ No newline at end of file |