Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop
authorGérald Niel <gerald.niel@gegeweb.org>
Sun, 25 Mar 2018 13:56:45 +0000 (15:56 +0200)
committerGérald Niel <gerald.niel@gegeweb.org>
Sun, 25 Mar 2018 13:56:45 +0000 (15:56 +0200)

Trivial merge