From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 12 Mar 2020 12:58:52 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.7.4~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ad6cbdb6ab874d7eab013a237bb3ef417e3c06ee;p=telemeta.git

Merge branch 'dev' of github.com:Parisson/Telemeta into dev
---

ad6cbdb6ab874d7eab013a237bb3ef417e3c06ee