diff options
| author | MikeCheng1208 <a3804430@hotmail.com> | 2018-05-04 19:57:19 +0800 |
|---|---|---|
| committer | Yung chieh Tsai <x01ep23i@hotmail.com> | 2018-05-29 12:38:32 +0800 |
| commit | 8b8cc94f6f8cb949ee214e814d9d8949d17ddd16 (patch) | |
| tree | dbcf5a360a01f5f28f72754874eb91d528e5e03f /app/manifest.json | |
| parent | 88a6b4edc79a27e9d94dc4ec25e9de02153abc5d (diff) | |
| download | tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.gz tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.bz2 tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.lz tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.xz tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.zst tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.zip | |
Intergrate ENS with IPFS
Diffstat (limited to 'app/manifest.json')
| -rw-r--r-- | app/manifest.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/manifest.json b/app/manifest.json index 0f5a2566f..ad500e40a 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -74,4 +74,8 @@ ] }, "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'" +<<<<<<< HEAD } +======= +} +>>>>>>> Intergrate ENS with IPFS |