From: Chocobozzz <me@florianbigard.com>
Date: Mon, 11 May 2020 09:09:45 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: v2.2.0-rc.1~51
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=610d0be13b3d01f653ef269271dd667a57c85ef2;p=oweals%2Fpeertube.git

Merge branch 'master' into develop
---

610d0be13b3d01f653ef269271dd667a57c85ef2