diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-08-02 23:41:29 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-08-02 23:41:29 +0800 |
commit | 25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220 (patch) | |
tree | 8e8f6225578722fb825ec0d98b2ff73b94f543d9 /app/scripts/inpage.js | |
parent | ece9200c72cd0b53ee237263933b2b9a24ae5802 (diff) | |
parent | d15e402ed87bf7533250c49a7972a7b1a12c99c2 (diff) | |
download | tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.tar tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.tar.gz tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.tar.bz2 tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.tar.lz tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.tar.xz tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.tar.zst tangerine-wallet-browser-25cffd21f8defdf5a1bf139bdc2e3b1cfd08c220.zip |
Merge branch 'master' into transactionControllerRefractor
Diffstat (limited to 'app/scripts/inpage.js')
-rw-r--r-- | app/scripts/inpage.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ec764535e..9e98c044b 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -65,3 +65,4 @@ function restoreContextAfterImports () { console.warn('MetaMask - global.define could not be overwritten.') } } + |