From: Chocobozzz <me@florianbigard.com>
Date: Wed, 11 Sep 2019 09:09:18 +0000 (+0200)
Subject: Merge branch 'release/1.4.0' into develop
X-Git-Tag: v2.0.0-rc.1~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;p=oweals%2Fpeertube.git

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

8c559fad1e1c4c2ab7f1388c73200aa4c6256d74