Commit Graph

4 Commits

Author SHA1 Message Date
061646a7d6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
2023-06-20 23:05:14 +02:00
Leon Market
8275d8bd5a Added 2023-06-14 22:11:17 +02:00
5c0263198c added new Project ueberwachungssystem 2023-05-11 15:25:28 +02:00
dda3d5693a Initial commit Project Version 0 2023-05-11 15:08:50 +02:00