crystal-wallet-android/app/src
Javier Varona 25ecf59bf2 Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android
# Conflicts:
#	app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java
#	app/src/main/java/cy/agorise/crystalwallet/viewmodels/validators/ImportSeedValidator.java
2017-10-03 23:47:08 -04:00
..
androidTest/java/carbon/crypto/com/carbon Change graphenej import 2017-10-03 16:25:18 -04:00
main Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android 2017-10-03 23:47:08 -04:00
test/java/carbon/crypto/com/carbon First commit (Base Android Studio project) 2017-08-17 18:38:05 -03:00