Marc Alexander 0028ed3e95 Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html		2016-01-08 16:39:33 +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'	2016-01-08 16:39:33 +01:00