Winfried 080fffba3d Merge branch 'master' into 849-apache-webroot ... # Conflicts: # DOCUMENTATION/content/getting-started/index.md		2017-04-28 21:14:39 +02:00
..
contributing	update contribution guide	2017-04-22 14:07:50 -04:00
documentation	Merge pull request #858 from winfried-van-loon/828-phpmyadmin-adminer-port	2017-04-27 08:39:29 -07:00
getting-started	Merge branch 'master' into 849-apache-webroot	2017-04-28 21:14:39 +02:00
guides	Merge branch 'master' into 849-apache-webroot	2017-04-28 21:14:39 +02:00
help	Delet the _settings folder from the Documentation	2017-04-14 14:43:28 -04:00
introduction	update documentation: what is docker	2017-04-22 16:25:25 -04:00
license	Delet the _settings folder from the Documentation	2017-04-14 14:43:28 -04:00
related-projects	Delet the _settings folder from the Documentation	2017-04-14 14:43:28 -04:00