From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 24 May 2017 22:39:17 +0000 (+0200)
Subject: Merge branch 'feature/dj1.8' of github.com:Parisson/telemeta into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~21^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2d4cdd3869adebef9668590a5addd7079678afd4;p=telemeta.git

Merge branch 'feature/dj1.8' of github.com:Parisson/telemeta into feature/dj1.8
---

2d4cdd3869adebef9668590a5addd7079678afd4