Marc Alexander 64e5965a02 Merge branch '3.3.x'		2019-11-01 22:10:32 +01:00
..
all/template	[ticket/13645] Move the feeds to controllers	2015-08-23 22:36:10 +02:00
prosilver	Merge branch '3.3.x'	2019-11-01 22:10:32 +01:00