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

..

java

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

2022-06-27 23:04:33 +02:00

res

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

2022-06-27 23:04:33 +02:00

AndroidManifest.xml

broadcast trigger

2022-05-22 17:31:55 +02:00