From: Chocobozzz <me@florianbigard.com>
Date: Tue, 3 Sep 2019 13:43:47 +0000 (+0200)
Subject: Merge branch 'release/1.4.0' into develop
X-Git-Tag: v2.0.0-rc.1~95
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=282e61e6c11f79e919c543871783fe1a00298d18;p=oweals%2Fpeertube.git

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

282e61e6c11f79e919c543871783fe1a00298d18