Miguel Siebenhaar c198292fbf Merge remote-tracking branch 'origin/master' into Kommunikationcopie ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java # app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java # app/src/main/res/layout/activity_main.xml		2023-06-20 21:13:26 +02:00
..
src	Merge remote-tracking branch 'origin/master' into Kommunikationcopie	2023-06-20 21:13:26 +02:00
.gitignore	Initial commit Project Version 0	2023-05-11 15:08:50 +02:00
build.gradle	Merge remote-tracking branch 'origin/master' into Kommunikationcopie	2023-06-20 21:13:26 +02:00
proguard-rules.pro	Initial commit Project Version 0	2023-05-11 15:08:50 +02:00