aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-22 08:14:18 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-22 08:14:18 +0200
commitc8db7ae7c44c32fc206558fc60340002d0f8ca2a (patch)
tree858cfaf1c0e24f921749229519c47ed89b24509e /phpBB/docs
parentd30b5207b88ded150cd33730f9cfd2d56c83edaa (diff)
parenta959e5f4ccd045a38af74f4ff93d18f98c83ed93 (diff)
downloadforums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar
forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar.gz
forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar.bz2
forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar.xz
forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/overall_header.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index a03e0ea8d6..20f8a45ec4 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -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: