aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-10-12 10:42:37 +0800
committerkumavis <aaron@kumavis.me>2018-10-12 10:42:37 +0800
commitf194f07801358099b9c6e69522528ed411611bc3 (patch)
tree6dbec947089691c0dffd5febbe6e92c1f712e40f /app
parent1bbc55a53379294a9d92a3648798b1a400050176 (diff)
parentdb981b827b07c946e17d3a8aeaefd2143c236ef7 (diff)
downloadtangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.tar
tangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.tar.gz
tangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.tar.bz2
tangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.tar.lz
tangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.tar.xz
tangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.tar.zst
tangerine-wallet-browser-f194f07801358099b9c6e69522528ed411611bc3.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into develop
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/manifest.json b/app/manifest.json
index e223171d3..cd34a586d 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -77,4 +77,4 @@
"*"
]
}
-} \ No newline at end of file
+}