Merge branch 'master' of https://github.com/Chocobozzz/PeerTube.wiki
authorPierre-Antoine Rault <par@rigelk.eu>
Sun, 25 Feb 2018 14:19:49 +0000 (15:19 +0100)
committerPierre-Antoine Rault <par@rigelk.eu>
Sun, 25 Feb 2018 14:19:49 +0000 (15:19 +0100)

Trivial merge