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
..
src/main	Merge remote-tracking branch 'origin/gui' into gui	2024-11-15 06:49:13 +01:00
build.gradle	init for monopoly	2024-11-12 14:53:04 +01:00
client.properties	init for monopoly	2024-11-12 14:53:04 +01:00
logging.properties	init for monopoly	2024-11-12 14:53:04 +01:00