mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases 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
parent f86c5d905b 55f6329c1d
commit ca1ac36c20
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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