From: Chocobozzz <me@florianbigard.com>
Date: Tue, 13 Nov 2018 14:32:12 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: v1.1.0-rc.1~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=be0f59b4eec3c2c4dcd151e2b174be39dff1568e;p=oweals%2Fpeertube.git

Merge branch 'master' into develop
---

be0f59b4eec3c2c4dcd151e2b174be39dff1568e