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

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Marc Alexander
2015-11-15 19:55:47 +01:00
2 changed files with 8 additions and 0 deletions

View File

@@ -2218,6 +2218,13 @@ viewtopic_body_post_buttons_list_before
* Purpose: Add post button custom list to posts (next to edit, quote etc),
before the original list.
viewtopic_body_post_subject_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.7-RC1
* Purpose: Add data before post icon and subject
viewtopic_body_postrow_custom_fields_after
===
* Locations: