Merge branch 'master' into pico-1.1

Browse Source

Conflicts:
	_build/deploy-phpdoc-branch.sh
	themes/default/index.twig
	themes/default/style.css

...

This commit is contained in:

Daniel Rudolf

2016-11-02 23:02:20 +01:00

parent 214fb085e5 a5b4367bed

commit 163513c917

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available