diff options
author | Maximilian Hils <git@maximilianhils.com> | 2017-08-21 15:08:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-21 15:08:25 +0200 |
commit | 7fcc945b4fa8d02edaec76349898c5cbdb678339 (patch) | |
tree | 5a1b5dd80db449eb0037e0367356e49123dc7f3d /mitmproxy/tools/web/master.py | |
parent | 9d3759728ae2437645d610fd5284144cc9c0a3f9 (diff) | |
parent | 2baa2c4049ab6b2801b3836b28b3e9df815a0075 (diff) | |
download | mitmproxy-7fcc945b4fa8d02edaec76349898c5cbdb678339.tar.gz mitmproxy-7fcc945b4fa8d02edaec76349898c5cbdb678339.tar.bz2 mitmproxy-7fcc945b4fa8d02edaec76349898c5cbdb678339.zip |
Merge pull request #2510 from MatthewShao/static-viewer
[WIP][web]Static viewer converter for mitmweb
Diffstat (limited to 'mitmproxy/tools/web/master.py')
-rw-r--r-- | mitmproxy/tools/web/master.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py index b13aeff9..c391a1cd 100644 --- a/mitmproxy/tools/web/master.py +++ b/mitmproxy/tools/web/master.py @@ -12,6 +12,7 @@ from mitmproxy.addons import readfile from mitmproxy.addons import termlog from mitmproxy.addons import view from mitmproxy.addons import termstatus +from mitmproxy.addons import static_viewer from mitmproxy.options import Options # noqa from mitmproxy.tools.web import app, webaddons @@ -37,6 +38,7 @@ class WebMaster(master.Master): webaddons.WebAddon(), intercept.Intercept(), readfile.ReadFile(), + static_viewer.StaticViewer(), self.view, self.events, ) |