Marc Alexander a937e38bd5 Merge branch '3.1.x' into 3.2.x ... Conflicts: phpBB/docs/events.md phpBB/styles/subsilver2/template/memberlist_view.html		2016-02-27 10:54:48 +01: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-02-27 10:54:48 +01:00