Marc Alexander 2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x ... Conflicts: phpBB/adm/style/install_update_diff.html phpBB/adm/style/installer_header.html phpBB/install/database_update.php phpBB/install/index.php phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html		2016-03-24 16:12:56 +01:00
..
all/template	[ticket/13645] Move the feeds to controllers	2015-08-23 22:36:10 +02:00
prosilver	Merge branch 'ticket/14136' into ticket/14136-3.2.x	2016-03-24 16:12:56 +01:00