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

..

images

[ticket/12648] Fix and modernize ACP header tabs

2014-06-24 00:02:24 +02:00

style

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

index.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00