aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/contentscript.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-04-03 14:04:55 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-04-03 14:04:55 +0800
commitf81fdbc34ff037ab64a9f4c98100304e7b1132e4 (patch)
tree20f2a75068af1b4b13ecb9a9b6276e07af94de93 /app/scripts/contentscript.js
parent89c924101e3ff52849c5a82ced7e058e1fa39dfd (diff)
parent235a70b9392d8b87eae4fc141e7f0be1d7788ee2 (diff)
downloadtangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.tar
tangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.tar.gz
tangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.tar.bz2
tangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.tar.lz
tangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.tar.xz
tangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.tar.zst
tangerine-wallet-browser-f81fdbc34ff037ab64a9f4c98100304e7b1132e4.zip
Merge branch 'master' into mascara
Diffstat (limited to 'app/scripts/contentscript.js')
-rw-r--r--app/scripts/contentscript.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 9a390e580..4d7e682d3 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -2,7 +2,7 @@ const LocalMessageDuplexStream = require('post-message-stream')
const PongStream = require('ping-pong-stream/pong')
const PortStream = require('./lib/port-stream.js')
const ObjectMultiplex = require('./lib/obj-multiplex')
-const extension = require('./lib/extension')
+const extension = require('extensionizer')
const fs = require('fs')
const path = require('path')