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

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

4c1def5fd8e9f483238eb38e221f555e2e6bbf07