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