]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 18 Jun 2018 21:05:50 +0000 (23:05 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 18 Jun 2018 21:05:50 +0000 (23:05 +0200)

Trivial merge