Marc Beyer 2944c44d1d Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen ...

# Conflicts:
#	hellofx/app/build/resources/main/client/main-view.fxml

2021-11-15 13:22:52 +01:00

..

build/resources/main/client

Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen

2021-11-15 13:22:52 +01:00

src/main

added css

2021-11-15 13:17:43 +01:00

build.gradle.kts

added css

2021-11-15 13:17:43 +01:00