|
|
23be5a1b91
|
Merge branch '0100-Termine_anzeigen' into 0300-Kalender
|
2021-11-15 13:25:13 +01:00 |
|
|
|
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 |
|
|
|
bab5ef0a93
|
added css
|
2021-11-15 13:17:43 +01:00 |
|
|
|
8f3042c5f9
|
Merge remote-tracking branch 'origin/0300-Kalender' into 0300-Kalender
|
2021-11-15 13:11:58 +01:00 |
|
|
|
cb498b3062
|
added jackson version control
|
2021-11-15 13:11:12 +01:00 |
|
|
|
0303fcf467
|
fixed gitignore the second
|
2021-11-15 11:12:45 +01:00 |
|
|
|
68275e1830
|
fixed gitignore the second
|
2021-11-15 11:10:55 +01:00 |
|
|
|
96e0853d20
|
Complete rewrite/restructure of the project
|
2021-11-14 23:00:07 +01:00 |
|
