1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/includes/acp/acp_profile.php
This commit is contained in:
Marc Alexander
2015-07-22 10:38:35 +02:00
3 changed files with 82 additions and 2 deletions

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: