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

Browse Source

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

...

This commit is contained in:

Leon Market 2023-06-17 19:17:11 +02:00

parent 3d02d8d4c0 620528302e

commit 83268c763b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available