From: Chocobozzz <me@florianbigard.com>
Date: Tue, 29 Jan 2019 07:42:12 +0000 (+0100)
Subject: Merge branch 'develop' into release/v1.2.0
X-Git-Tag: v1.2.0~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d4520481271087aa284913ff6c198a93c0b37c49;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'develop' into release/v1.2.0
---

d4520481271087aa284913ff6c198a93c0b37c49