From: Chocobozzz <me@florianbigard.com>
Date: Fri, 19 Oct 2018 11:48:07 +0000 (+0200)
Subject: Merge branch 'release/v1.0.0' into develop
X-Git-Tag: v1.1.0-alpha.2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d8c8ea73a774c3568e6d28a4cbebcf7979d5c2a;p=oweals%2Fpeertube.git

Merge branch 'release/v1.0.0' into develop
---

6d8c8ea73a774c3568e6d28a4cbebcf7979d5c2a