schrom01 e23f8bcdde Merge remote-tracking branch 'origin/main' ... # Conflicts: # src/ch/zhaw/catan/SiedlerGame.java		2021-12-04 15:44:17 +01:00
..
catan	Merge remote-tracking branch 'origin/main'	2021-12-04 15:44:17 +01:00
hexboard	Added new class player.	2021-11-26 10:58:19 +01:00