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
..
AbstractPicoPlugin.php	Merge branch 'master' into pico-1.1	2016-06-18 20:23:23 +02:00
Pico.php	Merge branch 'master' into pico-1.1	2016-06-18 20:23:23 +02:00
PicoPluginInterface.php	Improve phpDocs class docs	2016-05-23 15:13:56 +02:00
PicoTwigExtension.php	Merge branch 'master' into pico-1.1	2016-06-18 20:23:23 +02:00