Merge remote-tracking branch 'origin/master' into docker

# Conflicts:
#	README.md
This commit is contained in:
Martin Guether
2017-04-07 12:00:28 +02:00
3 changed files with 12 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ services:
- 9123:9000
db:
image: mongo
spacedeck:
spacedeck-open:
environment:
- env=development
build: .