From: Gérald Niel Date: Sun, 25 Mar 2018 13:56:45 +0000 (+0200) Subject: Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop X-Git-Tag: v1.0.0-beta.2~37^2~1 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5b107cd341936f30ec1246ed2fb20b3aed04703d;p=github%2FChocobozzz%2FPeerTube.git Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop --- 5b107cd341936f30ec1246ed2fb20b3aed04703d