Winfried 080fffba3d Merge branch 'master' into 849-apache-webroot ... # Conflicts: # DOCUMENTATION/content/getting-started/index.md		2017-04-28 21:14:39 +02:00
..
index.md	Merge branch 'master' into 849-apache-webroot	2017-04-28 21:14:39 +02:00