jens 5856c93fc8 Merge branch 'development' into development-stable ... # Conflicts: # app/src/main/res/values-it/strings.xml		2022-06-25 02:07:14 +02:00
..
java	Merge branch 'development' into development-stable	2022-06-25 02:07:14 +02:00
res	Merge branch 'development' into development-stable	2022-06-25 02:07:14 +02:00
AndroidManifest.xml	broadcast trigger	2022-05-22 17:31:55 +02:00