diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-07-19 16:59:23 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-19 16:59:23 +1200 |
commit | ecd01ce7c68dfe46c37482ddbc6ae58cc029af3b (patch) | |
tree | 41a322456f55f8a87b41aba0489cb990846bbfd2 /web/src/js/components/MainView.jsx | |
parent | 5034a6232c715b332ede160babdd7e875b25ca23 (diff) | |
parent | 9c9d28d068d5c0aadea2baf10b48435f6283d659 (diff) | |
download | mitmproxy-ecd01ce7c68dfe46c37482ddbc6ae58cc029af3b.tar.gz mitmproxy-ecd01ce7c68dfe46c37482ddbc6ae58cc029af3b.tar.bz2 mitmproxy-ecd01ce7c68dfe46c37482ddbc6ae58cc029af3b.zip |
Merge pull request #1379 from cortesi/proxyconfig
Unify ProxyConfig and Options
Diffstat (limited to 'web/src/js/components/MainView.jsx')
0 files changed, 0 insertions, 0 deletions