Marco Kühn 521b1cb2f7 Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix ... # Conflicts: # client/app/src/main/java/main/CreateEventController.java		2022-01-18 09:48:22 +01:00
..
src/main	Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix	2022-01-18 09:48:22 +01:00
build.gradle.kts	Implementet JFoenix	2022-01-11 12:13:24 +01:00