Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v1

Browse source

# Conflicts:
#	back/src/Assets/Maps/Floor0/floor0.json

...

This commit is contained in:

David Négrier 2020-05-12 00:24:05 +02:00

parent 98e73582c8 0daddb3669

commit cf49f7de00

7 changed files with 1335 additions and 670 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

1286

back/src/Assets/Maps/Floor0/floor0.json

View file

File diff suppressed because one or more lines are too long