From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 23 Mar 2017 14:51:33 +0000 (+0100)
Subject: Merge branch 'dev' into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~22^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cd05c8a93fff50e9e7966713316ece1a6be0dad2;p=telemeta.git

Merge branch 'dev' into feature/dj1.8
---

cd05c8a93fff50e9e7966713316ece1a6be0dad2