From: kevin <k.nguyen@thecodingmachine.com>
Date: Tue, 2 Jun 2020 23:28:37 +0000 (+0200)
Subject: Merge branch 'master' of github.com:thecodingmachine/workadventure into landingpage
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=46aa4a51f42518bb5183ab6b2852e2153c4fba0b;p=libreadventure.git

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

46aa4a51f42518bb5183ab6b2852e2153c4fba0b