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

..

java

Merge remote-tracking branch 'origin/master'

2021-12-08 21:50:00 +01:00

resources

Improve display in terminal view and add Shot icon in Window view

2021-12-08 21:47:34 +01:00