From: Jérémie Astor <fennecdjay@gmail.com>
Date: Sat, 29 May 2021 13:54:34 +0000 (+0200)
Subject: Merge branch 'traits'
X-Git-Tag: nightly~619
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=ad6328bf2f22819d814a4f7710385ad030888875;p=gwion.git

Merge branch 'traits'
---

ad6328bf2f22819d814a4f7710385ad030888875