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/features/index.py | |
| 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/features/index.py')
| -rw-r--r-- | doc-src/features/index.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc-src/features/index.py b/doc-src/features/index.py index 40a2669c..693b4439 100644 --- a/doc-src/features/index.py +++ b/doc-src/features/index.py @@ -9,6 +9,7 @@ pages = [ Page("replacements.html", "Replacements"), Page("responsestreaming.html", "Response Streaming"), Page("reverseproxy.html", "Reverse proxy mode"), + Page("socksproxy.html", "SOCKS Mode"), Page("setheaders.html", "Set Headers"), Page("serverreplay.html", "Server-side replay"), Page("sticky.html", "Sticky cookies and auth"), |