Javier Varona c216dfa209 Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop ... # Conflicts: # app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java		2018-10-24 23:07:11 -04:00
..
androidTest/java/cy/agorise/crystalwallet	deleted all carbon names	2017-10-07 12:06:58 -04:00
main	Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop	2018-10-24 23:07:11 -04:00
test/java/cy/agorise/crystalwallet	deleted all carbon names	2017-10-07 12:06:58 -04:00