diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-10 12:03:56 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-10 12:03:56 -0700 |
| commit | 0b241a1da71ef9eb7632fc0e32abcf061dcbd217 (patch) | |
| tree | 703f1a5ff9d9c00b4bc36c5e4ded4583af6b87c3 /web/conf.js | |
| parent | 11fb21719179f243b9f2a069cba42c1d7f3722c0 (diff) | |
| parent | c33df55919cf2238deff34b22856f8304e6279e3 (diff) | |
| download | mitmproxy-0b241a1da71ef9eb7632fc0e32abcf061dcbd217.tar.gz mitmproxy-0b241a1da71ef9eb7632fc0e32abcf061dcbd217.tar.bz2 mitmproxy-0b241a1da71ef9eb7632fc0e32abcf061dcbd217.zip | |
Merge remote-tracking branch 'jason/master'
Diffstat (limited to 'web/conf.js')
| -rw-r--r-- | web/conf.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/conf.js b/web/conf.js index 7fe75da4..cc616a63 100644 --- a/web/conf.js +++ b/web/conf.js @@ -11,7 +11,7 @@ var conf = { // Package these as well as the dependencies vendor_includes: [ ], - app: 'src/js/app.js', + app: 'src/js/app', eslint: ["src/js/**/*.js", "!src/js/filt/filt.js"] }, css: { @@ -27,4 +27,4 @@ var conf = { peg: ["src/js/filt/filt.peg"] }; -module.exports = conf;
\ No newline at end of file +module.exports = conf; |