1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewforum_body.html
This commit is contained in:
Marc Alexander
2015-10-08 14:44:58 +02:00
2 changed files with 32 additions and 0 deletions

View File

@@ -1601,6 +1601,34 @@ ucp_friend_list_after
* Since: 3.1.0-a4
* Purpose: Add optional elements after list of friends in UCP
viewforum_body_topic_row_after
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.7-RC1
* Purpose: Add content after the topic list item.
viewforum_body_topic_row_append
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the topic list item.
viewforum_body_topic_row_before
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.7-RC1
* Purpose: Add content before the topic list item.
viewforum_body_topic_row_prepend
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the topic list item.
viewforum_buttons_bottom_before
===
* Locations: