mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
This commit is contained in:
Joas Schilling
2015-04-06 14:27:48 +02:00
parent 478fed7ee1 7d08bf5b3e
commit 370fce1651
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/docs/events.md
View File

@@ -903,6 +903,13 @@ posting_pm_header_find_username_before
* Since: 3.1.0-RC4
* Purpose: Add content before the find username link on composing pm
posting_poll_body_options_after
===
* Locations:
+ styles/prosilver/template/posting_poll_body.html
* Since: 3.1.4-RC1
* Purpose: Add content after the poll options on creating a poll
quickreply_editor_panel_after
===
* Locations: