jens 5d67452486 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		2022-05-21 13:37:50 +02:00
..
strings.xml	Merge remote-tracking branch 'origin/development-stable' into development	2022-05-21 13:37:50 +02:00