aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-08-04 06:12:24 +0800
committerkumavis <aaron@kumavis.me>2017-08-04 06:12:24 +0800
commitbb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe (patch)
tree885f4e3877c52f92ee0ee115f79f5c34753ccada
parentda16f396266daa5ab0acc8f0c04d3e25b98c39f0 (diff)
parentb1311b48c96d873f571e26cad8e4f5d2f61dec25 (diff)
downloadtangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.tar
tangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.tar.gz
tangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.tar.bz2
tangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.tar.lz
tangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.tar.xz
tangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.tar.zst
tangerine-wallet-browser-bb8a09375dfa941a02f9d8d78c60cbcb97b3f5fe.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial
-rw-r--r--README.md5
-rw-r--r--package.json2
2 files changed, 5 insertions, 2 deletions
diff --git a/README.md b/README.md
index c50216594..ca6437a0e 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
# MetaMask Plugin [![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) [![Coverage Status](https://coveralls.io/repos/github/MetaMask/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/MetaMask/metamask-extension?branch=master)
+[![Greenkeeper badge](https://badges.greenkeeper.io/MetaMask/metamask-extension.svg)](https://greenkeeper.io/)
## Support
If you're a user seeking support, [here is our support site](http://metamask.consensyssupport.happyfox.com).
+<<<<<<< HEAD
-[![Greenkeeper badge](https://badges.greenkeeper.io/MetaMask/metamask-extension.svg)](https://greenkeeper.io/)
+=======
+>>>>>>> b1311b48c96d873f571e26cad8e4f5d2f61dec25
## Developing Compatible Dapps
diff --git a/package.json b/package.json
index 8cc0e6936..cbfcd3a76 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,8 @@
"express": "^4.14.0",
"extension-link-enabler": "^1.0.0",
"extensionizer": "^1.0.0",
- "gulp-eslint": "^4.0.0",
"fast-levenshtein": "^2.0.6",
+ "gulp-eslint": "^4.0.0",
"hat": "0.0.3",
"idb-global": "^2.1.0",
"identicon.js": "^2.3.1",