From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 26 Jan 2018 08:38:50 +0000 (+0100)
Subject: Merge branch 'feature/box' into dev
X-Git-Tag: 1.2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f98a32e634a7615de82a590b5aadf3c4fc7c0612;p=teleforma.git

Merge branch 'feature/box' into dev
---

f98a32e634a7615de82a590b5aadf3c4fc7c0612