diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-28 12:35:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-28 12:35:25 +0200 |
| commit | 5bf48bddf8c94e0ec948f66a6cb50dd4f99df6c6 (patch) | |
| tree | 93ef407e5a7cf966b248b563094495f7deabe597 /phpBB/docs/events.md | |
| parent | c5b2822cf50188cb65f973fb4c2d1315f47d25b2 (diff) | |
| parent | 0daa999fd015a1a176380a12d43cd48acfd57413 (diff) | |
| download | forums-5bf48bddf8c94e0ec948f66a6cb50dd4f99df6c6.tar forums-5bf48bddf8c94e0ec948f66a6cb50dd4f99df6c6.tar.gz forums-5bf48bddf8c94e0ec948f66a6cb50dd4f99df6c6.tar.bz2 forums-5bf48bddf8c94e0ec948f66a6cb50dd4f99df6c6.tar.xz forums-5bf48bddf8c94e0ec948f66a6cb50dd4f99df6c6.zip | |
Merge branch 'ticket/13808' into ticket/13808-master
* ticket/13808:
[ticket/13808] Fix version
Conflicts:
phpBB/docs/events.md
Diffstat (limited to 'phpBB/docs/events.md')
| -rw-r--r-- | phpBB/docs/events.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 893ed26f59..df62034304 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -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 |