From: Chocobozzz <me@florianbigard.com>
Date: Tue, 2 Jun 2020 09:18:29 +0000 (+0200)
Subject: Merge branch 'release/2.2.0' into develop
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35b30b643cf9870b0934f34253ffb23cf6a264b0;p=oweals%2Fpeertube.git

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

35b30b643cf9870b0934f34253ffb23cf6a264b0