1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
This commit is contained in:
Marc Alexander
2015-08-09 20:59:14 +02:00
2 changed files with 8 additions and 1 deletions

View File

@@ -1037,6 +1037,13 @@ posting_poll_body_options_after
* Since: 3.1.4-RC1
* Purpose: Add content after the poll options on creating a poll
posting_topic_title_before
===
* Locations:
+ styles/prosilver/template/posting_layout.html
* Since: 3.1.6-RC1
* Purpose: Allows to add some information on the left of the topic title in the posting form
quickreply_editor_panel_after
===
* Locations: