Merge branch 'patch-1' into 'develop'
authorChocobozzz <chocobozzz@framasoft.org>
Sun, 11 Mar 2018 08:52:19 +0000 (09:52 +0100)
committerChocobozzz <chocobozzz@framasoft.org>
Sun, 11 Mar 2018 08:52:19 +0000 (09:52 +0100)
commit2bd01b6fa7c83ff278dfc352e88ed961533d1e1a
tree3effc661cc6e56cfb444d12e78c07edcb1716321
parent746a3d47a7ea3d406e5954f30e82e2c70a26848a
parent7f456189b71b1b0dda962e583d2119cfd4aa1af9
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