Javier Varona ac46440ed5 Merge remote-tracking branch 'remotes/origin/feat_improve_contacts' into develop_ui_improvements ... # Conflicts: # app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java # app/src/main/res/layout/board.xml		2018-09-04 21:14:30 -04:00
..
schemas/cy.agorise.crystalwallet.dao.CrystalDatabase	New unit test implementation github style for some UI implementations	2018-08-27 07:31:55 -05:00
src	Merge remote-tracking branch 'remotes/origin/feat_improve_contacts' into develop_ui_improvements	2018-09-04 21:14:30 -04:00
.gitignore	First commit (Base Android Studio project)	2017-08-17 18:38:05 -03:00
build.gradle	Remove network package testing implementation	2018-09-03 10:49:25 -06:00
proguard-rules.pro	First commit (Base Android Studio project)	2017-08-17 18:38:05 -03:00