jens 41efa7c11b Merge remote-tracking branch 'origin/development-stable' into development ... # Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml # build.gradle # fastlane/metadata/android/en-US/changelogs/119.txt		2022-05-15 01:54:32 +02:00
..
java	Merge remote-tracking branch 'origin/development-stable' into development	2022-05-15 01:54:32 +02:00
res	Merge remote-tracking branch 'origin/development-stable' into development	2022-05-15 01:54:32 +02:00
AndroidManifest.xml	GooglePlayFlavor location engine disabled notice.	2021-03-16 23:23:42 +01:00