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

Browse Source

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Player/Player.ts
#	front/src/index.ts
#	front/yarn.lock

...

This commit is contained in:

David Négrier

2020-08-17 22:51:37 +02:00

parent 2d818ec79d e1989c1c21

commit 6b970adc6c

304 changed files with 2395 additions and 797 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

front/yarn.lock

+1032 -561

File diff suppressed because it is too large Load Diff