Thomas b9b1909495 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-bn/strings.xml # app/src/main/res/values-br/strings.xml # app/src/main/res/values-ca/strings.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-da/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-el/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-fi/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-he/strings.xml # app/src/main/res/values-hi/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-id/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-ko/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values-no/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-pt/strings.xml # app/src/main/res/values-ro/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-sr/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-ta/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-ur/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # fastlane/metadata/android/el/full_description.txt # fastlane/metadata/android/eu/full_description.txt # fastlane/metadata/android/nl/full_description.txt # fastlane/metadata/android/pt/full_description.txt		2020-02-18 12:26:42 +01:00
..
src	Merge branch 'l10n_develop' into develop	2020-02-18 12:26:42 +01:00
.gitignore	First commit	2020-01-25 10:25:02 +01:00
build.gradle	Release 1.2.0	2020-02-17 18:04:43 +01:00
proguard-rules.pro	First commit	2020-01-25 10:25:02 +01:00