Merge branch 'master' into pico-1.1

Conflicts:
	_build/deploy-phpdoc-branch.sh
	themes/default/index.twig
	themes/default/style.css
master
Daniel Rudolf 9 years ago
commit 163513c917
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538

Diff Content Not Available