From: Chocobozzz <me@florianbigard.com>
Date: Fri, 22 May 2020 07:14:08 +0000 (+0200)
Subject: Merge branch 'release/2.2.0' into develop
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a84e6eb11ce4f3db36fa34c2e223173e44a5eb50;p=oweals%2Fpeertube.git

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

a84e6eb11ce4f3db36fa34c2e223173e44a5eb50