1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/mcp_front.html
This commit is contained in:
Joas Schilling
2014-12-27 14:09:38 +01:00
2 changed files with 45 additions and 0 deletions

View File

@@ -431,6 +431,41 @@ mcp_ban_unban_before
* Since: 3.1.0-RC3
* Purpose: Add additional fields to the unban form in MCP
mcp_front_latest_logs_after
===
* Locations:
+ styles/prosilver/template/mcp_front.html
* Since: 3.1.3-RC1
* Purpose: Add content after latest logs list
mcp_front_latest_logs_before
===
* Locations:
+ styles/prosilver/template/mcp_front.html
* Since: 3.1.3-RC1
* Purpose: Add content before latest logs list
mcp_front_latest_reported_before
===
* Locations:
+ styles/prosilver/template/mcp_front.html
* Since: 3.1.3-RC1
* Purpose: Add content before latest reported posts list
mcp_front_latest_reported_pms_before
===
* Locations:
+ styles/prosilver/template/mcp_front.html
* Since: 3.1.3-RC1
* Purpose: Add content before latest reported private messages list
mcp_front_latest_unapproved_before
===
* Locations:
+ styles/prosilver/template/mcp_front.html
* Since: 3.1.3-RC1
* Purpose: Add content before latest unapproved posts list
memberlist_body_username_append
===
* Locations: