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

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
This commit is contained in:
Marc Alexander
2015-08-22 09:09:08 +02:00
2 changed files with 18 additions and 2 deletions

View File

@@ -563,6 +563,20 @@ mcp_post_additional_options
* Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions
mcp_topic_options_after
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some options (field, checkbox, ...) after the subject field when split a subject
mcp_topic_options_before
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some options (field, checkbox, ...) before the subject field when split a subject
mcp_topic_topic_title_after
===
* Locations: