VPR-Frontend/hellofx
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
..
app Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen 2021-11-15 13:22:52 +01:00
data Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen 2021-11-15 13:22:52 +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