Miguel Siebenhaar 02cbb14f3c Merge remote-tracking branch 'origin/ms_master_copie' ...

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

2023-06-22 12:11:02 +02:00

..

src

Merge remote-tracking branch 'origin/ms_master_copie'

2023-06-22 12:11:02 +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