aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/INSTALL.html
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-03-24 16:12:56 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-03-24 16:12:56 +0100
commit2e3f89444a7bad3e723b4a990b7c1c1a46914c81 (patch)
treec132bc6838ed6a34b34268e3a33e2d8b9031b2b6 /phpBB/docs/INSTALL.html
parented21921c58c678844e39db87f0c487ce07acf8ab (diff)
parent244d171cb035f0229ad2a06d01062ca809a72025 (diff)
downloadforums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar
forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.gz
forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.bz2
forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.xz
forums-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.zip
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
Diffstat (limited to 'phpBB/docs/INSTALL.html')
-rw-r--r--phpBB/docs/INSTALL.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 86b320d197..c0e0dce2a7 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -2,6 +2,7 @@
<html dir="ltr" lang="en">
<head>
<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" />
<meta name="description" content="phpBB 3.1.x Installation, updating and conversion informations" />
<title>phpBB &bull; Install</title>