Thomas 16c9a135dd Merge branch 'develop' into 'l10n_develop' ... # Conflicts: # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fr/strings.xml # fastlane/metadata/android/ar/full_description.txt # fastlane/metadata/android/ar/short_description.txt # fastlane/metadata/android/de/full_description.txt # fastlane/metadata/android/de/short_description.txt		2020-01-26 09:01:36 +01:00
..
src	Merge branch 'develop' into 'l10n_develop'	2020-01-26 09:01:36 +01:00
.gitignore	First commit	2020-01-25 10:25:02 +01:00
build.gradle	Small changes	2020-01-25 16:22:40 +01:00
proguard-rules.pro	First commit	2020-01-25 10:25:02 +01:00