]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'release/1.7' into feature/dj1.8
authorThomas Fillon <thomas@parisson.com>
Wed, 20 Sep 2017 11:42:31 +0000 (13:42 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 20 Sep 2017 11:42:31 +0000 (13:42 +0200)

Trivial merge