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

Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Joas Schilling
2015-01-06 11:25:26 +01:00
2 changed files with 16 additions and 0 deletions

View File

@@ -1320,6 +1320,20 @@ viewtopic_body_poll_question_prepend
* Since: 3.1.0-b3
* Purpose: Add content directly before the poll question on the View topic screen
viewtopic_body_post_author_after
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.3-RC1
* Purpose: Add content directly after the post author on the view topic screen
viewtopic_body_post_author_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.3-RC1
* Purpose: Add content directly before the post author on the view topic screen
viewtopic_body_post_buttons_after
===
* Locations: