Daniel Rudolf 3f17a2e28e Merge branch 'master' into pico-1.1 ... Conflicts: content-sample/index.md themes/default/font/fontello.eot themes/default/font/fontello.svg themes/default/font/fontello.ttf themes/default/font/fontello.woff themes/default/font/fontello.woff2 themes/default/fontello.css		2017-05-01 20:38:03 +02:00
..
font	Merge branch 'master' into pico-1.1	2017-05-01 20:38:03 +02:00
js	Rename Pico 1.1 to Pico 2.0	2016-12-12 15:31:06 +01:00
fontello.css	Merge branch 'master' into pico-1.1	2017-05-01 20:38:03 +02:00
index.twig	Give pages starting with a underscore (_) a special treatment	2016-12-12 14:49:05 +01:00
style.css	Rename Pico 1.1 to Pico 2.0	2016-12-12 15:31:06 +01:00