Marco Kühn 4aafae9896 Merge branch 'option-ui' into merge ... # Conflicts: # client/data/src/main/java/res/DataController.java		2022-01-26 13:26:15 +01:00
..
src/main/java	Merge branch 'option-ui' into merge	2022-01-26 13:26:15 +01:00
build.gradle.kts	Fixed event/all and event/del endpoints	2022-01-19 00:16:23 +01:00