Miguel Siebenhaar 5a0aab0176 Merge branch 'master' into copie ...

# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

2023-06-21 13:29:54 +02:00

..

src

Merge branch 'master' into copie

2023-06-21 13:29:54 +02:00

.gitignore

added new Project ueberwachungssystem

2023-05-11 15:25:28 +02:00

build.gradle

Merge remote-tracking branch 'origin/master' into Kommunikationcopie

2023-06-20 21:13:26 +02:00

proguard-rules.pro

added new Project ueberwachungssystem

2023-05-11 15:25:28 +02:00