From: Chocobozzz <chocobozzz@framasoft.org>
Date: Sun, 11 Mar 2018 08:52:19 +0000 (+0100)
Subject: Merge branch 'patch-1' into 'develop'
X-Git-Tag: v1.0.0-alpha.7~9
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=2bd01b6fa7c83ff278dfc352e88ed961533d1e1a;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'patch-1' into 'develop'

`docker-compose up app` need a docker-compose.yml file in current folder to work.

See merge request chocobozzz/PeerTube!3
---

2bd01b6fa7c83ff278dfc352e88ed961533d1e1a