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

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

8d5e65349deebd499c0be10fe02d535a77d58ddb