1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 21:10:31 +02:00

Merge branch '3.1.x'

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

View File

@@ -1737,6 +1737,20 @@ viewtopic_body_footer_before
* Purpose: Add content to the bottom of the View topic screen below the posts
and quick reply, directly before the jumpbox in Prosilver.
viewtopic_body_poll_after
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.6-RC1
* Purpose: Add content after the poll panel.
viewtopic_body_poll_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.6-RC1
* Purpose: Add content before the poll panel.
viewtopic_body_poll_option_after
===
* Locations: