diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 10:38:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 10:38:35 +0200 |
| commit | 8bfbd7782815aeee6ada6fa8a495b780fc21cb3d (patch) | |
| tree | f37e9081dd7ec2ff0844b2676ac538cf854813fb /phpBB/docs | |
| parent | b635853479e006dd06c739e4f549f103d9b134a8 (diff) | |
| parent | 5da50fcf6e97fcc50d1f414ce0fe5fb2212fadf2 (diff) | |
| download | forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar.gz forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar.bz2 forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.tar.xz forums-8bfbd7782815aeee6ada6fa8a495b780fc21cb3d.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/acp/acp_profile.php
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/events.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index fb7dc3e172..208b42a616 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -133,6 +133,13 @@ acp_posting_buttons_before * Since: 3.1.0-b4 * Purpose: Add content before BBCode posting buttons in the ACP +acp_profile_contact_before +=== +* Locations: + + adm/style/acp_profile.html +* Since: 3.1.6-RC1 +* Purpose: Add extra options to custom profile field configuration in the ACP + acp_ranks_edit_after === * Locations: |