Bastian Kohler 4baf3db1bb Merge branch 'tw' into bk_video_test ...

# 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

2023-06-18 11:02:20 +02:00

..

src

Merge branch 'tw' into bk_video_test

2023-06-18 11:02:20 +02:00

.gitignore

Initial commit Project Version 0

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

build.gradle

Merge branch 'tw' into bk_video_test

2023-06-18 11:02:20 +02:00

proguard-rules.pro

Initial commit Project Version 0

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