Marco Kühn dc1b1643d8 Merge branch '0300-Kalender' into merge ... # Conflicts: # hellofx/app/build/resources/main/client/style.css # hellofx/app/src/main/resources/client/style.css		2021-11-26 13:25:05 +01:00
..
app	Merge branch '0300-Kalender' into merge	2021-11-26 13:25:05 +01:00
data	Merge branch '0100-Termine_anzeigen' into 0300-Kalender	2021-11-15 13:25:13 +01:00
gradle/wrapper	Complete rewrite/restructure of the project	2021-11-14 23:00:07 +01:00
build.gradle.kts	Complete rewrite/restructure of the project	2021-11-14 23:00:07 +01:00
gradlew	Complete rewrite/restructure of the project	2021-11-14 23:00:07 +01:00
gradlew.bat	Complete rewrite/restructure of the project	2021-11-14 23:00:07 +01:00
settings.gradle.kts	Complete rewrite/restructure of the project	2021-11-14 23:00:07 +01:00