From: Chocobozzz <me@florianbigard.com>
Date: Wed, 20 May 2020 11:53:51 +0000 (+0200)
Subject: Merge branch 'release/2.2.0' into develop
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=745437e3ab402d5b8f85de6e9c09c3b6092e5904;p=oweals%2Fpeertube.git

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

745437e3ab402d5b8f85de6e9c09c3b6092e5904