Thomas 0e4f62ec11 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/fullLinks/fastlane/metadata/android/fa/short_description.txt # app/src/fullLinks/fastlane/metadata/android/fi/full_description.txt # app/src/fullLinks/fastlane/metadata/android/fi/short_description.txt # app/src/fullLinks/fastlane/metadata/android/it/short_description.txt # app/src/fullLinks/fastlane/metadata/android/pl/short_description.txt # app/src/fullLinks/fastlane/metadata/android/pt/full_description.txt		2020-12-17 14:54:30 +01:00
..
fastlane/metadata/android	Merge branch 'l10n_develop' into develop	2020-12-17 14:54:30 +01:00
AndroidManifest.xml	Release 1.17.0	2020-12-12 18:12:53 +01:00