diff options
| author | kumavis <aaron@kumavis.me> | 2016-06-29 04:11:50 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2016-06-29 04:11:50 +0800 |
| commit | 57aca116ed33476ce87d9c5f9248013e0b3c5fcc (patch) | |
| tree | 2ddf55ec9579b579640509686d60468a84da64ff /ui/app/app.js | |
| parent | 494b62dcf8262e2c9f18e0b59b23129d5b625210 (diff) | |
| parent | 2fd03a60fb8c536dbe56c86e1836935616ea14d8 (diff) | |
| download | tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.gz tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.zst tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.zip | |
Merge branch 'master' into FixSomeFormatting
# Conflicts:
# CHANGELOG.md
# app/scripts/lib/notifications.js
Diffstat (limited to 'ui/app/app.js')
| -rw-r--r-- | ui/app/app.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 8a51f968b..80521d220 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -355,4 +355,3 @@ App.prototype.toggleMetamaskActive = function () { this.props.dispatch(actions.lockMetamask(false)) } } - |