diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
| commit | 90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4 (patch) | |
| tree | 3739c65edfe8a7c4e7eca455d2f1a522176e3af7 /testem.yml | |
| parent | 44f25cd93c18c57acf993ace3387a4d569d8dcca (diff) | |
| parent | 43ea223c9fe8ee593a572b153defc5ddefd72e95 (diff) | |
| download | tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.gz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.bz2 tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.lz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.xz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.zst tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.zip | |
Fix merge conflicts.
Diffstat (limited to 'testem.yml')
0 files changed, 0 insertions, 0 deletions