mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-30 19:49:54 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
This commit is contained in:
Marc Alexander
2016-06-19 18:07:29 +02:00
parent 70b04016eb aaa99b4719
commit 450e5b36b8
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/styles/prosilver/template/search_results.html
View File

@@ -134,6 +134,7 @@
</ul>
</div>
<!-- ENDIF -->
<!-- EVENT topiclist_row_topic_title_after -->
<!-- EVENT topiclist_row_append -->
</div>