Marc Alexander c5a995ec8d Merge branch '3.2.x'		2019-04-29 09:40:19 +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-29 09:40:19 +02:00