mirror of
https://github.com/phpbb/phpbb.git
synced 2025-10-29 14:36:28 +01:00
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/overall_header.html
This commit is contained in:
@@ -85,7 +85,7 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- EVENT overall_header_navbar_before -->
|
||||
<!-- INCLUDE navbar_header.html -->
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user