Schoumi 043ba6ab7a Merge branch 'master' of https://github.com/Exodus-Privacy/exodus-android-app ... +fix some bug in translation files # Conflicts: # app/src/main/res/values-de/strings.xml		2019-01-09 16:01:05 +01:00
..
src	Merge branch 'master' of https://github.com/Exodus-Privacy/exodus-android-app	2019-01-09 16:01:05 +01:00
.gitignore	Release 1.0.2	2018-04-03 01:25:48 +02:00
build.gradle	Release 1.1.0	2018-12-06 18:11:08 +01:00
proguard-rules.pro	Pre-Release version	2018-02-20 13:54:18 +01:00