Marc Beyer 12fce27d04 Merge remote-tracking branch 'origin/merge' into merge ... # Conflicts: # client/data/src/main/java/res/Event.java		2022-01-10 13:24:42 +01:00
..
src/main/java/res	Merge remote-tracking branch 'origin/merge' into merge	2022-01-10 13:24:42 +01:00
build.gradle.kts	renamed projekt folder and package file	2021-11-29 15:44:55 +01:00