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

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
This commit is contained in:
Joas Schilling
2015-06-04 17:46:36 +02:00
3 changed files with 53 additions and 3 deletions

View File

@ -501,6 +501,13 @@ mcp_front_latest_unapproved_before
* Since: 3.1.3-RC1
* Purpose: Add content before latest unapproved posts list
mcp_post_additional_options
===
* Locations:
+ styles/prosilver/template/mcp_post.html
* Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions
memberlist_body_username_append
===
* Locations: