aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-05-28 11:09:24 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2015-05-28 11:09:24 +0200
commitc5b2822cf50188cb65f973fb4c2d1315f47d25b2 (patch)
tree8a7fd27062bb48b09ab5d58b1a4b90dcc099f736 /phpBB/docs
parent95b3b4605a073edde70027c4ad4c889cec89c7a8 (diff)
parent8fda16527e75ae46dfa6e4dc580bf58e1162b2ea (diff)
downloadforums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar
forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar.gz
forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar.bz2
forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.tar.xz
forums-c5b2822cf50188cb65f973fb4c2d1315f47d25b2.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13808] search_body_form_before Conflicts: phpBB/styles/subsilver2/template/search_body.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index b7b5e7de61..893ed26f59 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -987,6 +987,13 @@ quickreply_editor_message_before
* Since: 3.1.0-a4
* Purpose: Add content before the quick reply textbox
+search_body_form_before
+===
+* Locations:
+ + styles/prosilver/template/search_body.htm
+* Since: 3.1.5
+* Purpose: Add content before the search form
+
search_results_header_after
===
* Locations: