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-20 10:08:47 +02:00
2 changed files with 15 additions and 1 deletions

View File

@@ -535,6 +535,20 @@ mcp_post_additional_options
* Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions
mcp_topic_topic_title_after
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some information after the topic title
mcp_topic_topic_title_before
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some information before the topic title
mcp_warn_post_add_warning_field_after
===
* Locations: