Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android

Browse source

# Conflicts:
#	app/src/main/java/cy/agorise/crystalwallet/views/CryptoCoinBalanceViewHolder.java

...

This commit is contained in:

Javier Varona 2017-10-17 20:38:12 -04:00

parent 7123c01aff 82e7566116

commit 441aedf7b4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available