diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-10-23 16:17:03 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-10-23 16:17:03 +0200 |
| commit | 77c9f64526fb49f8787d85c879d7ff6bc91d7f56 (patch) | |
| tree | a5ee61de0e2a45c7c94ab90edba6efd39bffec71 /doc-src/_nav.html | |
| parent | 4bf07d8aa5b137cf39282502cc960b88ba40a790 (diff) | |
| parent | 6bed0764609029e9d01b1d28b7826fb37ab20d3e (diff) | |
| download | mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.tar.gz mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.tar.bz2 mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Conflicts:
doc-src/modes.html
Diffstat (limited to 'doc-src/_nav.html')
| -rw-r--r-- | doc-src/_nav.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc-src/_nav.html b/doc-src/_nav.html index 8bd03db2..0ae0fa67 100644 --- a/doc-src/_nav.html +++ b/doc-src/_nav.html @@ -17,13 +17,14 @@ $!nav("serverreplay.html", this, state)!$ $!nav("setheaders.html", this, state)!$ $!nav("passthrough.html", this, state)!$ - $!nav("tcpproxy.html", this, state)!$ - $!nav("sticky.html", this, state)!$ + $!nav("proxyauth.html", this, state)!$ $!nav("reverseproxy.html", this, state)!$ + $!nav("responsestreaming.html", this, state)!$ + $!nav("socksproxy.html", this, state)!$ + $!nav("sticky.html", this, state)!$ + $!nav("tcpproxy.html", this, state)!$ $!nav("upstreamproxy.html", this, state)!$ $!nav("upstreamcerts.html", this, state)!$ - $!nav("proxyauth.html", this, state)!$ - $!nav("responsestreaming.html", this, state)!$ <li class="nav-header">Installing Certificates</li> |