aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/events.md
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-06-04 17:46:36 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-06-04 17:46:36 +0200
commitc28a213b1b80205c5e53df5764a408898eb75c7c (patch)
tree9977826fdc1b96d69676adc85ff0fc961be64160 /phpBB/docs/events.md
parentf3f82bd3776047ba99d0ba828ce43ff743e65b02 (diff)
parentbb7f8433441343eaaf0c15aa9f27c4227256e3c7 (diff)
downloadforums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar
forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar.gz
forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar.bz2
forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar.xz
forums-c28a213b1b80205c5e53df5764a408898eb75c7c.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/mcp_post.html
Diffstat (limited to 'phpBB/docs/events.md')
-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 df62034304..7836ae08f8 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -501,6 +501,13 @@ mcp_front_latest_unapproved_before
* Since: 3.1.3-RC1
* Purpose: Add content before latest unapproved posts list
+mcp_post_additional_options
+===
+* Locations:
+ + styles/prosilver/template/mcp_post.html
+* Since: 3.1.5-RC1
+* Purpose: Add content within the list of post moderation actions
+
memberlist_body_username_append
===
* Locations: