aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-08-03 22:21:25 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-08-03 22:21:25 +0200
commit6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f (patch)
tree346f9c614a1ac0a96222c03c3aac01ac8f328e65 /phpBB/docs
parent55123bc94cfbade9bae44cb8b8924bb58ccdbf15 (diff)
parent5330ea0f0924ec8edff8522d340654617080e95e (diff)
downloadforums-6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f.tar
forums-6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f.tar.gz
forums-6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f.tar.bz2
forums-6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f.tar.xz
forums-6cc4d78ebf2ea0be14e39b32d1ab38ee05cfbd7f.zip
Merge branch '3.1.x' into 3.2.x
Conflicts: phpBB/styles/subsilver2/template/memberlist_email.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 9a002fa15c..d5aa0c3aec 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -909,6 +909,13 @@ memberlist_body_username_prepend
* Purpose: Add information before every username in the memberlist. Works in
all display modes (leader, group and normal memberlist).
+memberlist_email_before
+===
+* Locations:
+ + styles/prosilver/template/memberlist_email.html
+* Since: 3.1.10-RC1
+* Purpose: Allow adding customizations before the memberlist_email form.
+
memberlist_search_fields_after
===
* Locations: