diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-20 05:57:30 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-20 05:57:30 +0800 |
| commit | afbc4c832ba86fcb94b612c93796a5ffa422b457 (patch) | |
| tree | dbdaa16920fd175171603b182d332dbf87655bd4 /ui/app/first-time/restore-vault.js | |
| parent | ad3fa24a28c0ec45dca43a257005626a4027487a (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.gz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.zst tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.zip | |
Git merge resolution.
Diffstat (limited to 'ui/app/first-time/restore-vault.js')
0 files changed, 0 insertions, 0 deletions