From: grégoire parant <g.parant@thecodingmachine.com>
Date: Mon, 13 Apr 2020 14:10:09 +0000 (+0200)
Subject: Merge pull request #40 from thecodingmachine/kharhamel-interaction
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2ce6ed2d484fe344c41575fe8349bb9ec62a5cd7;p=libreadventure.git

Merge pull request #40 from thecodingmachine/kharhamel-interaction

conflict interaction @Kharhamel
---

2ce6ed2d484fe344c41575fe8349bb9ec62a5cd7