Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension into greenkeeper/initial

This commit is contained in:
kumavis 2017-08-03 16:39:19 -07:00
commit 82ba2c95ee
1 changed files with 0 additions and 4 deletions

View File

@ -4,10 +4,6 @@
## Support
If you're a user seeking support, [here is our support site](http://metamask.consensyssupport.happyfox.com).
<<<<<<< HEAD
=======
>>>>>>> b1311b48c96d873f571e26cad8e4f5d2f61dec25
## Developing Compatible Dapps