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

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

7024e9120b381b5b3201212f5a18f5cdc14e15ff