1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
This commit is contained in:
Marc Alexander
2015-08-22 08:11:15 +02:00
2 changed files with 32 additions and 3 deletions

View File

@@ -290,6 +290,34 @@ acp_users_prefs_view_prepend
* Since: 3.1.0-b3
* Purpose: Add user options fieldset to the top of ACP users view prefs settings
attachment_file_after
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add content after the attachment.
attachment_file_append
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add custom attachment types displaying to the bottom of attachment block.
attachment_file_before
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add content before the attachment.
attachment_file_prepend
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add custom attachment types displaying to the top of attachment block.
forumlist_body_category_header_after
===
* Locations: