Merge commit 'ba27cf1b' into release-5.0-reverted-222
authorAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 4 Sep 2018 13:13:56 +0000 (14:13 +0100)
committerAlex Heneveld <alex.heneveld@cloudsoftcorp.com>
Tue, 4 Sep 2018 13:13:56 +0000 (14:13 +0100)
commit22ef529063c3b7beb3e681fa42f240b65c2064ca
treebbb28dc45b5d74ff0416bf5505c76eaf28c5b24c
parentc26c8b9eaef1229916378560d8aa2a8736122f09
parentba27cf1bceac018b4a795c6de382d9b9d6f933fa
Merge commit 'ba27cf1b' into release-5.0-reverted-222

merged with conflicts, will be reverted
12 files changed:
guide/blueprints/index.md
guide/blueprints/setting-locations.md
guide/blueprints/test/test-entities.md
guide/blueprints/test/usage-examples.md
guide/ops/gui/blueprints.md
guide/ops/gui/index.md
guide/ops/index.md
guide/ops/production-installation.md
guide/ops/troubleshooting/connectivity.md
guide/ops/troubleshooting/index.md
guide/start/index.md
guide/start/managing.md