Merge branch 'master' of github.com:thecodingmachine/workadventure into landingpage
authorkevin <k.nguyen@thecodingmachine.com>
Tue, 2 Jun 2020 23:28:37 +0000 (01:28 +0200)
committerkevin <k.nguyen@thecodingmachine.com>
Tue, 2 Jun 2020 23:28:37 +0000 (01:28 +0200)

Trivial merge