Marc Alexander e8f08ef465 Merge branch '3.2.x'		2019-04-12 22:04:44 +02:00
..
all/template	[ticket/13645] Move the feeds to controllers	2015-08-23 22:36:10 +02:00
prosilver	Merge branch '3.2.x'	2019-04-12 22:04:44 +02:00