diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-04-03 14:04:55 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-04-03 14:04:55 +0800 |
commit | f81fdbc34ff037ab64a9f4c98100304e7b1132e4 (patch) | |
tree | 20f2a75068af1b4b13ecb9a9b6276e07af94de93 /app/scripts/contentscript.js | |
parent | 89c924101e3ff52849c5a82ced7e058e1fa39dfd (diff) | |
parent | 235a70b9392d8b87eae4fc141e7f0be1d7788ee2 (diff) | |
download | tangerine-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.js | 2 |
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') |