diff options
| author | kumavis <aaron@kumavis.me> | 2017-08-04 07:39:19 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-08-04 07:39:19 +0800 |
| commit | 82ba2c95ee98487dd465e5aabd45f18d46e89727 (patch) | |
| tree | fde46ffa4e41f3eefcfa89981c804181e084d6d9 | |
| parent | 55f0187df7c1dcde9a63d11cbfc152e936c2a9fa (diff) | |
| parent | b106fa814bfdd5576199969afa6302cda1274c49 (diff) | |
| download | tangerine-wallet-browser-82ba2c95ee98487dd465e5aabd45f18d46e89727.tar.gz tangerine-wallet-browser-82ba2c95ee98487dd465e5aabd45f18d46e89727.tar.zst tangerine-wallet-browser-82ba2c95ee98487dd465e5aabd45f18d46e89727.zip | |
Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension into greenkeeper/initial
| -rw-r--r-- | README.md | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 |