From: Chocobozzz <me@florianbigard.com>
Date: Mon, 17 Feb 2020 14:44:53 +0000 (+0100)
Subject: Merge branch 'release/2.1.0' into develop
X-Git-Tag: v2.2.0-rc.1~466
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=134cf2bce96a8c5aefd55154e884964975d8cf23;p=oweals%2Fpeertube.git

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

134cf2bce96a8c5aefd55154e884964975d8cf23