From: David MAECHLER <d.maechler@thecodingmachine.com>
Date: Sun, 5 Apr 2020 22:47:20 +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=bb2315e7ac559c9a63bad105ab931a1fcb501f91;p=libreadventure.git

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

bb2315e7ac559c9a63bad105ab931a1fcb501f91