Daniel Rudolf 0e8cd0873d

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

Conflicts:
	.htaccess

2016-04-24 20:23:00 +02:00

..

AbstractPicoPlugin.php

Replace is_a() function calls with instanceof operator

2016-03-11 19:07:45 +01:00

Pico.php

Merge branch 'master' into pico-1.1

2016-04-24 20:23:00 +02:00

PicoPluginInterface.php

Various small improvements

2015-10-29 02:55:30 +01:00

PicoTwigExtension.php

Merge branch 'master' into pico-1.1

2016-04-24 20:23:00 +02:00