From: Chocobozzz <me@florianbigard.com>
Date: Mon, 25 May 2020 07:00:13 +0000 (+0200)
Subject: Merge branch 'release/2.2.0' into develop
X-Git-Tag: v2.3.0-rc.1~293
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ba4e1a059d42c765131ac66c1d8df963a66450b6;p=github%2FChocobozzz%2FPeerTube.git

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

ba4e1a059d42c765131ac66c1d8df963a66450b6