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

Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Joas Schilling
2015-02-02 23:07:33 +01:00
2 changed files with 16 additions and 0 deletions

View File

@@ -1387,6 +1387,20 @@ viewtopic_body_postrow_post_content_footer
* Since: 3.1.0-RC4
* Purpose: Add data at the end of the posts.
viewtopic_body_postrow_post_details_after
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.4-RC1
* Purpose: Add content after the post details
viewtopic_body_postrow_post_details_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.1.4-RC1
* Purpose: Add content before the post details
viewtopic_body_postrow_post_notices_after
===
* Locations: