mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/includes/acp/acp_profile.php
This commit is contained in:
Marc Alexander
2015-07-22 10:38:35 +02:00
parent b635853479 5da50fcf6e
commit 8bfbd77828
3 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/docs/events.md
View File

@@ -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: