Gregoire Parant 3aaeda6f80 Merge branch 'develop' into action-button ...

# Conflicts:
#	front/dist/resources/style/style.css
#	front/src/Phaser/Game/GameScene.ts

2020-11-21 15:40:24 +01:00

..

style.css

Merge branch 'develop' into action-button

2020-11-21 15:40:24 +01:00