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

..

jens/automation2

Merge remote-tracking branch 'origin/development' into development

2022-07-19 17:58:41 +02:00