From: Chocobozzz <me@florianbigard.com>
Date: Mon, 24 Sep 2018 08:40:27 +0000 (+0200)
Subject: Merge branch 'develop' into unused-imports
X-Git-Tag: v1.0.0-beta.14~11^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F1105%2Fhead;p=oweals%2Fpeertube.git

Merge branch 'develop' into unused-imports
---

0b4e5fe32708afce54212810738aa4d0c3dc178d