Jens b0d509aafe Merge remote-tracking branch 'origin/development-stable' into development
# Conflicts:
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/strings.xml
2022-06-27 23:04:33 +02:00
..
2022-06-25 02:36:33 +02:00
2021-02-16 13:42:49 +01:00
2022-06-25 02:36:33 +02:00
2021-02-16 13:42:49 +01:00