forums/phpBB/adm/style/installer_header.html, branch master

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

2016-03-24T15:12:56+00:00

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

[ticket/14378] Use consistent template variable paths

2015-12-22T19:02:44+00:00

PHPBB3-14378

[ticket/14039] Fix T_TEMPLATE_PATH constant

2015-10-18T09:22:19+00:00

PHPBB3-14039

[ticket/13740] Replace more spaces with tabs

2015-07-24T06:33:02+00:00

PHPBB3-13740

[ticket/13740] Separate new installer style templates

2015-07-22T10:43:17+00:00

PHPBB3-13740