You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Daniel Rudolf ddf3da0391 Merge branch 'master' into pico-1.1 ... Conflicts: .htaccess config/config.php.template content-sample/index.md lib/Pico.php		9 years ago
..
config.php.template	Merge branch 'master' into pico-1.1	9 years ago