Yvonne Schmidt 2b772199b0 Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java		2024-11-15 06:49:13 +01:00
..
client	Merge remote-tracking branch 'origin/gui' into gui	2024-11-15 06:49:13 +01:00
model	Änderungs des StartBildschirms	2024-11-15 01:25:09 +01:00
server	init for monopoly	2024-11-12 14:53:04 +01:00
run-mac.sh	init for monopoly	2024-11-12 14:53:04 +01:00
run.sh	init for monopoly	2024-11-12 14:53:04 +01:00