1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Marc Alexander
2015-02-27 22:10:27 +01:00
2 changed files with 8 additions and 1 deletions

View File

@@ -64,7 +64,7 @@
<!-- ENDIF -->
</div>
<!-- ENDIF -->
<!-- EVENT viewtopic_body_pagination_top_after -->
</div>
<!-- IF S_HAS_POLL -->