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 | |
| parent | ed21921c58c678844e39db87f0c487ce07acf8ab (diff) | |
| parent | 244d171cb035f0229ad2a06d01062ca809a72025 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/FAQ.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/INSTALL.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/README.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/auth_api.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 1 |
6 files changed, 6 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> diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 4786d8d796..5f3a425cda 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.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 frequently asked questions" /> <title>phpBB • FAQ</title> 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 • Install</title> diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 96af78f48a..58791412e0 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.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 Readme" /> <title>phpBB • Readme</title> diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index 27d090c296..960fa76417 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.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="This is an explanation of how to use the phpBB auth/acl API" /> <title>phpBB3 • Auth API</title> diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 26189235ef..eb0fb60de2 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.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="Ascraeus coding guidelines document" /> <title>phpBB3 • Coding Guidelines</title> |