1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 14:31:19 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
  [ticket/9850] Display upgrade instructions for feature release in acp
  [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
This commit is contained in:
Andreas Fischer
2010-11-06 18:56:01 +01:00
7 changed files with 22 additions and 3 deletions

View File

@@ -11,7 +11,7 @@
<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
<meta name="keywords" content="" />
<meta name="description" content="" />
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
{META}
<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>