Master #2

Merged kalle merged 10 commits into docker:master from pis:master on 6 Jul 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View docker-compose.yml

Ignore Space Show notes View install.sh

Ignore Space Show notes View openhab.conf.example