crystal-wallet-android/app/src/main
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
..
assets Added bip39 and brainkey seeds 2018-01-06 23:21:46 -04:00
java/cy/agorise/crystalwallet Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-10-24 23:07:11 -04:00
res Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop 2018-10-24 23:07:11 -04:00
AndroidManifest.xml Camera permission was not included in the manifest 2018-09-29 22:55:48 -05:00
ic_launcher-web.png Change app logo 2018-05-25 13:51:41 -05:00