Merge pull request #3636 from nickvergessen/ticket/13808-master

Ticket/13808 master

Conflicts:
	phpBB/docs/events.md
This commit is contained in:
Marc Alexander 2015-05-28 12:44:33 +02:00
commit 0f689e3cad

View file

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