czaks 8ad1edf5d7 Merge master branch into staging ... Conflicts: templates/themes/ukko/theme.php		2014-04-30 18:28:46 +02:00
..
basic	update copyright footers in themes	2014-04-20 02:27:54 +02:00
catalog	integrate favelog into catalog theme; needs more work, code cleanup etc.	2014-04-30 00:14:25 +02:00
categories	update copyright footers in themes	2014-04-20 02:27:54 +02:00
frameset	update copyright footers in themes	2014-04-20 02:27:54 +02:00
recent	Revert "change thumb to file to overcome a nasty bug in upgrading"	2014-04-27 16:19:41 +02:00
sitemap	sitemap theme: fix php notice	2014-01-04 18:18:35 +01:00
ukko	Merge master branch into staging	2014-04-30 18:28:46 +02:00