Marc Alexander 7234bb4762 Merge branch '3.2.x'		2018-10-08 21:27:18 +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'	2018-10-08 21:27:18 +02:00