2 Commits

Author SHA1 Message Date
a29f6d204f Merge branch 'merge' into CSS-Refactor
# Conflicts:
#	client/app/src/main/resources/main/main-view.css
#	client/app/src/main/resources/main/main-view.fxml
2022-02-07 11:22:31 +01:00
7e3bd66571 Improvement of the main-view.fxml and main-view.css 2021-12-13 12:46:01 +01:00

Diff Content Not Available