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)
commite6cfae4f307095e823739e8144f3f20d8ecfbc0c
treec3fbbfc25f229d4356520230e8e7bf7250548868
parent8c4bb21050e2b050404275736280375daed2c8c4
parentaa1b28147c2c1cec400d8b2ac4c65dc331bf7f3e
Merge branch 'master' of https://github.com/Chocobozzz/PeerTube.wiki