1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
This commit is contained in:
Marc Alexander
2015-09-12 13:24:29 +02:00
2 changed files with 9 additions and 1 deletions

View File

@@ -1128,6 +1128,14 @@ posting_preview_poll_after
* Since: 3.1.7-RC1
* Purpose: Add content after the poll preview block
posting_topic_title_after
===
* Locations:
+ styles/prosilver/template/posting_layout.html
+ styles/subsilver2/template/posting_body.html
* Since: 3.1.7-RC1
* Purpose: Allows to add some information after the topic title in the posting form
posting_topic_title_before
===
* Locations: