aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-09-14 20:51:13 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-09-14 20:51:13 +0200
commit142f937354f4324cfd0bd1b2d991a3886ba1d464 (patch)
tree2dfcccfb1fe1782fc38ba18d46f290a5b2ebc33b /phpBB/docs
parent1a187e0607aeb23dc7f95fec0e3163898c2375f4 (diff)
parent70aa4407d3e045c3ed214e2147110e82a7b0d27c (diff)
downloadforums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar.gz
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar.bz2
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.tar.xz
forums-142f937354f4324cfd0bd1b2d991a3886ba1d464.zip
Merge branch '3.1.x' into 3.2.x
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 60cc4238d5..4903d0dfb2 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -343,6 +343,13 @@ acp_posting_buttons_before
* Since: 3.1.0-b4
* Purpose: Add content before BBCode posting buttons in the ACP
+acp_posting_buttons_custom_tags_before
+===
+* Locations:
+ + adm/style/acp_posting_buttons.html
+* Since: 3.1.10-RC1
+* Purpose: Add content before the custom BBCodes in the ACP
+
acp_profile_contact_before
===
* Locations: