aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-20 10:08:47 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-20 10:08:47 +0200
commit5ae821ee2890947d840f315e843c5e820882307a (patch)
treeca7c480cd1a6ab8071296bc13813868d1bbb2d8d /phpBB/docs
parentaaa13be1ec2c850390fcee6481d9241ee6551f9e (diff)
parent00aab15f7c4e66a60a20224f50f79f9f0730ed9e (diff)
downloadforums-5ae821ee2890947d840f315e843c5e820882307a.tar
forums-5ae821ee2890947d840f315e843c5e820882307a.tar.gz
forums-5ae821ee2890947d840f315e843c5e820882307a.tar.bz2
forums-5ae821ee2890947d840f315e843c5e820882307a.tar.xz
forums-5ae821ee2890947d840f315e843c5e820882307a.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 57db80d255..dbcf346b72 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -535,6 +535,20 @@ mcp_post_additional_options
* Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions
+mcp_topic_topic_title_after
+===
+* Locations:
+ + styles/prosilver/template/mcp_topic.html
+* Since: 3.1.6-RC1
+* Purpose: Add some information after the topic title
+
+mcp_topic_topic_title_before
+===
+* Locations:
+ + styles/prosilver/template/mcp_topic.html
+* Since: 3.1.6-RC1
+* Purpose: Add some information before the topic title
+
mcp_warn_post_add_warning_field_after
===
* Locations: