Merge branch '3.1.x'

Conflicts:
	phpBB/docs/events.md
This commit is contained in:
Marc Alexander 2015-05-28 12:42:56 +02:00
commit cdc86b3540

View file

@ -991,7 +991,7 @@ search_body_form_before
===
* Locations:
+ styles/prosilver/template/search_body.htm
* Since: 3.1.5
* Since: 3.1.5-RC1
* Purpose: Add content before the search form
search_results_header_after