]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 29 Oct 2019 08:30:44 +0000 (09:30 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 29 Oct 2019 08:30:44 +0000 (09:30 +0100)

Trivial merge