Merge branch 'master' of github.com:thecodingmachine/workadventure into map-v0
authorDavid Négrier <d.negrier@thecodingmachine.com>
Sun, 26 Apr 2020 19:48:57 +0000 (21:48 +0200)
committerDavid Négrier <d.negrier@thecodingmachine.com>
Sun, 26 Apr 2020 19:48:57 +0000 (21:48 +0200)

Trivial merge