aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2016-12-11 20:43:39 +0100
committerTristan Darricau <github@nicofuma.fr>2016-12-11 20:43:39 +0100
commitb7597a347b2acbbcd49ca63aaf334c4d79e2ba25 (patch)
tree7b99877a36ab8841c89130ec535dbcf21206eacb /phpBB/docs
parent809d73ca5eae048801d0aff7b0214d11edf90fc1 (diff)
parent8eda17f430a797b98b7448290d05910a9bbf580e (diff)
downloadforums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar
forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar.gz
forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar.bz2
forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.tar.xz
forums-b7597a347b2acbbcd49ca63aaf334c4d79e2ba25.zip
Merge branch '3.1.x' into 3.2.x
* 3.1.x: [ticket/14887] ACP profile step one lang specific event
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 619ba06c5f..75a773e906 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -381,6 +381,13 @@ acp_profile_contact_before
* Since: 3.1.6-RC1
* Purpose: Add extra options to custom profile field configuration in the ACP
+acp_profile_step_one_lang_after
+===
+* Locations:
+ + adm/style/acp_profile.html
+* Since: 3.1.11-RC1
+* Purpose: Add extra lang specific options to custom profile field step one configuration in the ACP
+
acp_prune_forums_append
===
* Locations: