mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Marc Alexander
2015-08-22 10:32:41 +02:00
parent 1cc3d24cd8 b09e1ad26d
commit fdca5532e6
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/styles/prosilver/template/viewtopic_body.html
View File

@@ -68,6 +68,8 @@
<!-- EVENT viewtopic_body_pagination_top_after -->
</div>
<!-- EVENT viewtopic_body_poll_before -->
<!-- IF S_HAS_POLL -->
<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
@@ -121,6 +123,8 @@
<hr />
<!-- ENDIF -->
<!-- EVENT viewtopic_body_poll_after -->
<!-- BEGIN postrow -->
<!-- EVENT viewtopic_body_postrow_post_before -->
<!-- IF postrow.S_FIRST_UNREAD -->