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

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

7cd1b12c19d0589d1d692ed0571ca0800f028aea