Merge branch 'master' of github.com:thecodingmachine/workadventure into develop

Browse source

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts

...

This commit is contained in:

David Négrier 2021-05-11 16:43:28 +02:00

parent 78d4985d10 5674b99734

commit 0c279750be

9 changed files with 160 additions and 116 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

front/dist/resources/logos/logo-WA-min.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.1 KiB