From: Chocobozzz <florian.bigard@gmail.com>
Date: Mon, 11 Dec 2017 10:06:32 +0000 (+0100)
Subject: Merge branch 'feature/design' into develop
X-Git-Tag: v0.0.1-alpha~149
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fada8d75550dc7365f7e18ee1569b9406251d660;p=oweals%2Fpeertube.git

Merge branch 'feature/design' into develop
---

fada8d75550dc7365f7e18ee1569b9406251d660