Develop #1

Merged kalle merged 14 commits into docker:master from docker:develop on 9 Mar 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View .gitignore

Ignore Space Show notes View backup.sh 0 → 100755

Ignore Space Show notes View clearPid.sh 0 → 100755

Ignore Space Show notes View docker-compose.yml

Ignore Space Show notes View install.sh

Show notes View openhab.conf 100644 → 0

Ignore Space Show notes View openhab.conf.example 0 → 100644