From: Chocobozzz <me@florianbigard.com>
Date: Thu, 6 Dec 2018 12:48:46 +0000 (+0100)
Subject: Merge branch 'hotfix/docker' into develop
X-Git-Tag: v1.2.0-rc.1~95
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=14d1b7b95a096b933ea353a715f4868a89dc5822;p=oweals%2Fpeertube.git

Merge branch 'hotfix/docker' into develop
---

14d1b7b95a096b933ea353a715f4868a89dc5822