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
..
sub	Update sample content	2015-08-28 18:34:14 +02:00
404.md	Update sample content	2015-08-28 18:34:14 +02:00
index.md	Merge branch 'master' into pico-1.1	2016-06-18 20:23:23 +02:00