From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 16 Jan 2017 09:41:24 +0000 (+0100)
Subject: Merge branch 'dev' into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~37
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f69accce5943a8ebe1718e06e94b8191e8610312;p=telemeta.git

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

f69accce5943a8ebe1718e06e94b8191e8610312