diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-03-22 13:33:11 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-03-22 13:33:11 +1300 |
| commit | 3bf4feb213adf2b9829cd5452ca365e4be7ca10c (patch) | |
| tree | 572463b2e5223499a977c4da2e3ce8118d373943 /web/src/js/actions.js | |
| parent | 89383e9c138f68caf1cc394174250c133d21aa04 (diff) | |
| parent | 89d66360d6f7caa9760fe56fa146396b1b4251dc (diff) | |
| download | mitmproxy-3bf4feb213adf2b9829cd5452ca365e4be7ca10c.tar.gz mitmproxy-3bf4feb213adf2b9829cd5452ca365e4be7ca10c.tar.bz2 mitmproxy-3bf4feb213adf2b9829cd5452ca365e4be7ca10c.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'web/src/js/actions.js')
| -rw-r--r-- | web/src/js/actions.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/src/js/actions.js b/web/src/js/actions.js index 64cd68a7..1b29438c 100644 --- a/web/src/js/actions.js +++ b/web/src/js/actions.js @@ -117,5 +117,6 @@ module.exports = { ConnectionActions: ConnectionActions, FlowActions: FlowActions, StoreCmds: StoreCmds, + SettingsActions: SettingsActions, Query: Query };
\ No newline at end of file |