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

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

4270a19fb62b8aba0f638034e4b8d8a6bca0c907