1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 16:45:19 +02:00

Merge branch 'ticket/13808' into ticket/13808-master

* ticket/13808:
  [ticket/13808] Fix version

Conflicts:
	phpBB/docs/events.md
This commit is contained in:
Joas Schilling 2015-05-28 12:35:25 +02:00
commit 5bf48bddf8

View File

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