Katchan e862e79a62 Merge remote-tracking branch 'origin/master' ... # Conflicts: # client/src/main/java/fr/lnl/game/client/App.java # server/src/main/java/fr/lnl/game/server/games/Game.java # server/src/test/java/fr/lnl/game/server/Mock.java		2021-12-02 20:06:53 +01:00
..
src	Merge remote-tracking branch 'origin/master'	2021-12-02 20:06:53 +01:00
build.gradle	Fix game not launching + add supprot to Computer Players (AI) + fix view not updating at each Game#play 's loop	2021-11-29 19:22:43 +01:00