aboutsummaryrefslogtreecommitdiffstats
path: root/mascara
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-10-26 09:49:02 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-26 09:49:02 +0800
commit5aecce908fe74019198ef7fb8626836157d14590 (patch)
treec82b4008be2de4e4805a423717402249b1824999 /mascara
parent22d9e3a7e6dfd21b3ea52007030d71f53e29b851 (diff)
parent988dd8fd6105dfe869592ad5238b5d1a80bb8435 (diff)
downloadtangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.tar
tangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.tar.gz
tangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.tar.bz2
tangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.tar.lz
tangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.tar.xz
tangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.tar.zst
tangerine-wallet-browser-5aecce908fe74019198ef7fb8626836157d14590.zip
Merge branch 'master' into NewUI-flat
Diffstat (limited to 'mascara')
-rw-r--r--mascara/server/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/mascara/server/index.js b/mascara/server/index.js
index f0d022f7d..83f84f6d1 100644
--- a/mascara/server/index.js
+++ b/mascara/server/index.js
@@ -18,7 +18,7 @@ function createMetamascaraServer () {
const server = express()
// ui window
serveBundle(server, '/ui.js', uiBundle)
- server.use(express.static(path.join(__dirname, '/../ui/', { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') })))
+ server.use(express.static(path.join(__dirname, '/../ui/'), { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') }))
server.use(express.static(path.join(__dirname, '/../../dist/chrome')))
// metamascara
serveBundle(server, '/metamascara.js', metamascaraBundle)