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
..
androidTest/java/cy/agorise/crystalwallet	deleted all carbon names	2017-10-07 12:06:58 -04:00
main	Merge remote-tracking branch 'remotes/origin/feat_improve_contacts' into develop_ui_improvements	2018-09-04 21:14:30 -04:00
test/java/cy/agorise/crystalwallet	deleted all carbon names	2017-10-07 12:06:58 -04:00