Javier Varona 4d10fc984e Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android ... # Conflicts: # app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java # app/src/main/java/cy/agorise/crystalwallet/application/CrystalApplication.java		2018-03-18 22:35:53 -04:00
..
assets	Added bip39 and brainkey seeds	2018-01-06 23:21:46 -04:00
java/cy/agorise/crystalwallet	Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android	2018-03-18 22:35:53 -04:00
res	Send and Receive FloatingActionButtons hide when scrolling down on the TransactionsFragment	2018-03-15 14:12:46 -06:00
AndroidManifest.xml	- Preferred Language Setting is now working	2018-03-18 22:27:45 -04:00