Simon Wilkening fd178eee43 Merge remote-tracking branch 'origin/gui' into gui ... # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/ConfirmTrade.java		2024-11-29 07:16:21 +01:00
..
src/main	Merge remote-tracking branch 'origin/gui' into gui	2024-11-29 07:16:21 +01:00
build.gradle	Gui v1.0	2024-11-25 05:33:36 +00:00
client.properties	Gui v1.0	2024-11-25 05:33:36 +00:00
logging.properties	init for monopoly	2024-11-12 14:53:04 +01:00