Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v1
authorDavid Négrier <d.negrier@thecodingmachine.com>
Mon, 11 May 2020 22:24:05 +0000 (00:24 +0200)
committerDavid Négrier <d.negrier@thecodingmachine.com>
Mon, 11 May 2020 22:24:05 +0000 (00:24 +0200)
commitcf49f7de006d90819e55386737d65cb3a35d9ad3
tree7f586c91cff61b5b1b31ccb17c8a86a8c802e876
parent98e73582c84b67ff6bbbbe645c729de20ed512c3
parent0daddb3669c20dc6b499e72b8903eaadbf1af8eb
Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v1

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