jens 937c6ffe1d Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/src/main/res/values/strings.xml
2022-07-19 17:58:41 +02:00
..
2021-07-08 17:57:33 +02:00
2022-01-11 17:27:07 +01:00
2021-02-16 13:42:49 +01:00
2021-02-16 13:42:49 +01:00
2021-02-16 13:42:49 +01:00