1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
This commit is contained in:
Marc Alexander
2015-08-22 08:14:18 +02:00
2 changed files with 8 additions and 0 deletions

View File

@@ -903,6 +903,13 @@ overall_header_content_before
* Since: 3.1.0-a3
* Purpose: Add content on all pages before the main content, after the header
overall_header_feeds
===
* Locations:
+ styles/prosilver/template/overall_header.html
* Since: 3.1.6-RC1
* Purpose: Add custom feeds
overall_header_head_append
===
* Locations: