makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
This commit is contained in:
Marc Alexander 2015-04-03 16:50:20 +02:00
commit ca1ac36c20
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/docs/events.md
View file

@ -776,6 +776,13 @@ overall_header_head_append
* Since: 3.1.0-a1 * Since: 3.1.0-a1
* Purpose: Add asset calls directly before the `</head>` tag * Purpose: Add asset calls directly before the `</head>` tag
overall_header_navbar_before
===
* Locations:
+ styles/prosilver/template/overall_header.html
* Since: 3.1.4-RC1
* Purpose: Add content before the navigation bar
overall_header_navigation_append overall_header_navigation_append
=== ===
* Locations: * Locations:

2
phpBB/styles/prosilver/template/overall_header.html
View file

@ -85,7 +85,7 @@
</div> </div>
</div> </div>
<!-- EVENT overall_header_navbar_before -->
<!-- INCLUDE navbar_header.html --> <!-- INCLUDE navbar_header.html -->
</div> </div>