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
..
cy/agorise/crystalwallet	Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android	2018-03-18 22:35:53 -04:00