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/osx.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/osx.html')
| -rw-r--r-- | doc-src/certinstall/osx.html | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/doc-src/certinstall/osx.html b/doc-src/certinstall/osx.html deleted file mode 100644 index a532d538..00000000 --- a/doc-src/certinstall/osx.html +++ /dev/null @@ -1,16 +0,0 @@ - -How to install the __mitmproxy__ certificate authority in OSX: - -<ol class="tlist"> - - <li>Open Finder, and double-click on the mitmproxy-ca-cert.pem file.</li> - - <li>You will be prompted to add the certificate. Click "Always Trust": - - <img src="@!urlTo('osx-addcert-alwaystrust.png')!@"/> - </li> - - <li> You may be prompted for your password. You should now see the - mitmproxy cert listed under "Certificates".</li> -</ol> - |