diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-06-22 04:19:44 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-06-22 04:19:44 +0800 |
| commit | ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb (patch) | |
| tree | b1390a02f04b43cf78c880c1dbb4c961fbe12dd6 /app | |
| parent | a08c3bc01b11fbd0e3a243359befbe9fc909edf4 (diff) | |
| parent | cfc056e34ba6dda983a1ca6b4bc090661b799d38 (diff) | |
| download | tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.tar tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.tar.gz tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.tar.bz2 tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.tar.lz tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.tar.xz tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.tar.zst tangerine-wallet-browser-ab15b4c8259d6f6c5ae9d1e51548d73cfc1c67cb.zip | |
Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLint
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/id-management.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/manifest.json b/app/manifest.json index 2e2d28f37..dede7402a 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "Metamask", - "version": "2.4.0", + "version": "2.4.1", "manifest_version": 2, "description": "__MSG_appDescription__", "icons": { diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js index b9a2fc3a8..4e18bc8a9 100644 --- a/app/scripts/lib/id-management.js +++ b/app/scripts/lib/id-management.js @@ -1,4 +1,6 @@ const ethUtil = require('ethereumjs-util') +const Transaction = require('ethereumjs-tx') +const configManager = require('./config-manager-singleton') module.exports = IdManagement |