From: Chocobozzz <me@florianbigard.com>
Date: Fri, 7 Feb 2020 08:10:59 +0000 (+0100)
Subject: Merge branch 'release/2.1.0' into develop
X-Git-Tag: v2.2.0-rc.1~518
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=338eb9d33af690db716805fd2277bf68f473b58f;p=oweals%2Fpeertube.git

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

338eb9d33af690db716805fd2277bf68f473b58f