From: Chocobozzz <me@florianbigard.com>
Date: Thu, 6 Feb 2020 16:22:56 +0000 (+0100)
Subject: Merge branch 'release/2.1.0' into develop
X-Git-Tag: v2.2.0-rc.1~523
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3b7421abb4192e215aa280418b62e96958c5e42;p=oweals%2Fpeertube.git

Merge branch 'release/2.1.0' into develop
---

a3b7421abb4192e215aa280418b62e96958c5e42