Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
authorGérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 17:28:55 +0000 (19:28 +0200)
committerGérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 17:28:55 +0000 (19:28 +0200)

Trivial merge