diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2016-03-24 16:12:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-24 16:12:56 +0100 |
| commit | 2e3f89444a7bad3e723b4a990b7c1c1a46914c81 (patch) | |
| tree | c132bc6838ed6a34b34268e3a33e2d8b9031b2b6 /phpBB/docs/CHANGELOG.html | |
| parent | Merge branch '3.1.x' into 3.2.x (diff) | |
| parent | [ticket/14136] Add back X-UA-Compatible meta tag (diff) | |
| download | phpbb-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.gz phpbb-2e3f89444a7bad3e723b4a990b7c1c1a46914c81.tar.bz2 phpbb-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/CHANGELOG.html')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f6e63196ee..10dc48b801 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.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 Changelog" /> <title>phpBB • Changelog</title> |