From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 20 Sep 2017 11:42:31 +0000 (+0200)
Subject: Merge branch 'release/1.7' into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~21^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=13a586ad5be5feeee4dc1a0369d9ae6b9e466e74;p=telemeta.git

Merge branch 'release/1.7' into feature/dj1.8
---

13a586ad5be5feeee4dc1a0369d9ae6b9e466e74