]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of /var/git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 27 Apr 2017 16:42:46 +0000 (18:42 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 27 Apr 2017 16:42:46 +0000 (18:42 +0200)

Trivial merge