From: David MAECHLER <d.maechler@thecodingmachine.com>
Date: Mon, 6 Apr 2020 15:35:58 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/thecodingmachine/workadventure into featu... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=60c0188e9e74171d4a8d7356e21e2342f7560ee0;p=libreadventure.git

Merge branch 'master' of https://github.com/thecodingmachine/workadventure into feature/back-players-proximity
---

60c0188e9e74171d4a8d7356e21e2342f7560ee0