diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-06 00:03:44 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-06 00:03:44 +0800 |
| commit | e647337a8a34d8fb4b5a8081888ec32ce5fd27a0 (patch) | |
| tree | 2060fcf05407d4cec876332a70d25418237a724d /ui/app/conf-tx.js | |
| parent | 45fc1d6ec356232e51fe4a9cc1f01929e35e8014 (diff) | |
| parent | 2885a9547187ce1ad0fb3bed1935387d901942a8 (diff) | |
| download | tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.gz tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.bz2 tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.lz tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.xz tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.zst tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.zip | |
Resolve merge conflict from master
Diffstat (limited to 'ui/app/conf-tx.js')
0 files changed, 0 insertions, 0 deletions