Merge remote-tracking branch 'origin/Kamera' into Kamera

# Conflicts:
#	app/src/main/java/com/example/greenwatch/Kamera.java
This commit is contained in:
Michael Pilhoefer 2023-05-30 18:38:58 +02:00
commit abe79b1efe

View File

@ -0,0 +1,4 @@
package com.example.greenwatch;
public class Kamera {
}