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

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

cdd8f7790c759664fe4d0962efa550cf1a8e37eb