Bastian Kohler f14b9592d8 Merge branch 'tw' into bk_recording_test
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
2023-06-17 09:44:15 +02:00
..
2023-05-11 15:08:50 +02:00