aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style/overall_header.html
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-12-07 13:32:19 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-12-07 13:32:19 +0100
commit47ea6bc9e61c71f6d54df848b6c61ace052d9e2a (patch)
tree9a4181d1c3c2d045abc1575634480d2ab5b1a634 /phpBB/adm/style/overall_header.html
parentf32a30eecacba212850a11b7b4740d0a69bd49de (diff)
parent71169de8230812f2d05b87bfba42331e04663b81 (diff)
downloadforums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar
forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar.gz
forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar.bz2
forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.tar.xz
forums-47ea6bc9e61c71f6d54df848b6c61ace052d9e2a.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
Conflicts: tests/functional/fixtures/ext/foo/bar/config/services.yml
Diffstat (limited to 'phpBB/adm/style/overall_header.html')
-rw-r--r--phpBB/adm/style/overall_header.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 455446f8e3..04f818f95a 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -103,7 +103,11 @@ function popup(url, width, height, name)
// ]]>
</script>
+
<!-- EVENT acp_overall_header_head_append -->
+
+{$STYLESHEETS}
+
</head>
<body class="{S_CONTENT_DIRECTION} nojs">
@@ -153,7 +157,6 @@ function popup(url, width, height, name)
</ul>
</div>
<!-- ENDIF -->
- </ul>
</div>
<div id="main">