Tobias Wolz 8e47934beb Merge branch 'tw' into master ...

# 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
#	gradle.properties

2023-06-20 21:42:25 +02:00

..

src

Merge branch 'tw' into master

2023-06-20 21:42:25 +02:00

.gitignore

Initial commit Project Version 0

2023-05-11 15:08:50 +02:00

build.gradle

Added DetectionService

2023-06-19 13:13:23 +02:00

proguard-rules.pro

Initial commit Project Version 0

2023-05-11 15:08:50 +02:00