diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-04-03 16:50:20 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-04-03 16:50:20 +0200 |
| commit | ca1ac36c20b0c6d1f83b37772e0f91d1f68f09cd (patch) | |
| tree | 4d0a841c469b9fb5328dd88c0a416e94f5968ba6 /phpBB/styles | |
| parent | f86c5d905bb82967505ef3e07fa429b59c112871 (diff) | |
| parent | 55f6329c1d99dfbb20c9ac75423f261ec2cf9158 (diff) | |
| download | forums-ca1ac36c20b0c6d1f83b37772e0f91d1f68f09cd.tar forums-ca1ac36c20b0c6d1f83b37772e0f91d1f68f09cd.tar.gz forums-ca1ac36c20b0c6d1f83b37772e0f91d1f68f09cd.tar.bz2 forums-ca1ac36c20b0c6d1f83b37772e0f91d1f68f09cd.tar.xz forums-ca1ac36c20b0c6d1f83b37772e0f91d1f68f09cd.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/overall_header.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index c4dbb6a035..e0c8e51d25 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -85,7 +85,7 @@ </div> </div> - + <!-- EVENT overall_header_navbar_before --> <!-- INCLUDE navbar_header.html --> </div> |