Marc Beyer 7aa615ce54 Merge branch '2410-develop' into merge ... # Conflicts: # client/app/src/main/java/main/MainController.java		2022-01-23 21:33:42 +01:00
..
src/main	Merge branch '2410-develop' into merge	2022-01-23 21:33:42 +01:00
build.gradle.kts	Implementet JFoenix	2022-01-11 12:13:24 +01:00