pbg2h21ama c5b249e096 Merge branch 'main' of https://git.bib.de/DopplerEffekt/VPR-Projekt-JavaFX ... # Conflicts: # target/classes/com/example/vpr_javafx/Registration-view.fxml		2023-01-30 19:59:08 +01:00
..
vpr_javafx	Merge branch 'main' of https://git.bib.de/DopplerEffekt/VPR-Projekt-JavaFX	2023-01-30 19:59:08 +01:00