Marc Alexander 019e85d064 Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/styles/subsilver2/template/mcp_move.html		2016-07-16 21:25:17 +02:00
..
all/template	[ticket/13645] Move the feeds to controllers	2015-08-23 22:36:10 +02:00
prosilver	Merge branch '3.1.x' into 3.2.x	2016-07-16 21:25:17 +02:00