diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 09:45:55 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-22 09:45:55 +0200 |
| commit | 49bffc1851298e4aadfe2771ed70902cc57d29ec (patch) | |
| tree | 1894988706a642cc9088277729094bdb9a8c1fac | |
| parent | 8b21e7c0d9d27f9d1722966bf71e088e232cd4b2 (diff) | |
| download | forums-49bffc1851298e4aadfe2771ed70902cc57d29ec.tar forums-49bffc1851298e4aadfe2771ed70902cc57d29ec.tar.gz forums-49bffc1851298e4aadfe2771ed70902cc57d29ec.tar.bz2 forums-49bffc1851298e4aadfe2771ed70902cc57d29ec.tar.xz forums-49bffc1851298e4aadfe2771ed70902cc57d29ec.zip | |
[ticket/13843] Fix merge issues and update @since version
PHPBB3-13843
| -rw-r--r-- | phpBB/docs/events.md | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 63f3c183ad..6235eee3a5 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -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 |