Daniel Rudolf ddf3da0391

Merge branch 'master' into pico-1.1 ...

Conflicts:
	.htaccess
	config/config.php.template
	content-sample/index.md
	lib/Pico.php

2016-06-18 20:23:23 +02:00

..

config.php.template

Merge branch 'master' into pico-1.1

2016-06-18 20:23:23 +02:00