makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13843] Fix merge issues and update @since version

Browse source 
PHPBB3-13843
This commit is contained in:
Marc Alexander 2015-07-22 09:45:55 +02:00
parent 8b21e7c0d9
commit 49bffc1851
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/docs/events.md
View file

@ -930,7 +930,7 @@ posting_editor_add_panel_tab
===
* Locations:
+ styles/prosilver/template/posting_editor.html
* Since: 3.1.5-RC1
* Since: 3.1.6-RC1
* Purpose: Add custom panel to post editor
posting_editor_bbcode_status_after
@ -1025,11 +1025,7 @@ posting_layout_include_panel_body
===
* Locations:
+ styles/prosilver/template/posting_layout.html
<<<<<<< HEAD
* Since: 3.1.5-RC1
=======
* Since: 3.1.5
>>>>>>> 5e45eb9... [ticket/13843] Add templates events to insert custom panel in posting
* Since: 3.1.6-RC1
* Purpose: Add include of custom panel template body in posting editor
posting_pm_header_find_username_after