pilhoefermi93253 abe79b1efe Merge remote-tracking branch 'origin/Kamera' into Kamera
# Conflicts:
#	app/src/main/java/com/example/greenwatch/Kamera.java
2023-05-30 18:38:58 +02:00
..
2023-05-11 16:12:05 +02:00
2023-05-11 16:12:05 +02:00