diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-11 16:08:14 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 16:08:14 +1200 |
| commit | 227d762cace09bc315e57644da2135480bf32cb9 (patch) | |
| tree | dd1b458e77d79a8f7867e31f7a352c19e586e129 /web/conf.js | |
| parent | 250b47487aa071e61f0bd2960992e80222103a3a (diff) | |
| parent | 0b241a1da71ef9eb7632fc0e32abcf061dcbd217 (diff) | |
| download | mitmproxy-227d762cace09bc315e57644da2135480bf32cb9.tar.gz mitmproxy-227d762cace09bc315e57644da2135480bf32cb9.tar.bz2 mitmproxy-227d762cace09bc315e57644da2135480bf32cb9.zip | |
Merge branch 'master' into toxfiddle
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; |