Sebastian Grewe 6522fb2747 fixing merge conflicts		2013-08-22 11:54:17 +02:00
..
default.tpl	fixing merge conflicts	2013-08-22 11:54:17 +02:00
small_table.tpl	Moving a lot of settings from config to adminpanel	2013-08-20 12:02:47 +02:00