diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
commit | bef023fb4a699c16fe0fff30ce18840678ed7ad0 (patch) | |
tree | d11be9af938712aeb554f070822be01b2d7fbceb /app/images/loading.svg | |
parent | 37d836fa72c75945d436bd94feadb65aa95d7e5f (diff) | |
parent | 39e0a33bba2709971edec0304027f646cb2db3cc (diff) | |
download | tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.gz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.bz2 tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.lz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.xz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.zst tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.zip |
Resolve merge conflict.
Diffstat (limited to 'app/images/loading.svg')
0 files changed, 0 insertions, 0 deletions