Katchan eaec044950 Merge remote-tracking branch 'origin/master' ... # Conflicts: # server/src/main/java/fr/lnl/game/server/games/Game.java		2021-12-08 21:50:00 +01:00
..
src/main	Merge remote-tracking branch 'origin/master'	2021-12-08 21:50:00 +01:00
build.gradle	Improve CrashException handler, fix java encoding, updated junit dependencies, add private methods to javadoc, renamed Error to ErrorMessage	2021-12-08 15:00:13 +01:00