Sebastian Grewe 6522fb2747 fixing merge conflicts		2013-08-22 11:54:17 +02:00
..
blocks	fixing merge conflicts	2013-08-22 11:54:17 +02:00
pool	fixing merge conflicts	2013-08-22 11:54:17 +02:00
default.tpl	Disable API on mobile theme if disabled	2013-07-18 10:49:16 +02:00