From: Gérald Niel Date: Thu, 19 Apr 2018 17:28:55 +0000 (+0200) Subject: Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop X-Git-Tag: v1.0.0-beta.4~38^2~1 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0db1a226507a39b0a663e3e63f04851836a44d5a;p=github%2FChocobozzz%2FPeerTube.git Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop --- 0db1a226507a39b0a663e3e63f04851836a44d5a