]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into feature/dj1.8
authorThomas Fillon <thomas@parisson.com>
Thu, 23 Mar 2017 14:51:33 +0000 (15:51 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 23 Mar 2017 14:51:33 +0000 (15:51 +0100)

Trivial merge