diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-28 12:42:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-28 12:42:56 +0200 |
| commit | cdc86b3540e3a506e4382bafb56b27f5845bc67d (patch) | |
| tree | fac067994c36d1c986b074eaa9e10868dff1a558 | |
| parent | d917e0140f27e21358e73d9b99c1dcd661444113 (diff) | |
| parent | 16deefa7f833258db42caaa5649b4adcd3cc045f (diff) | |
| download | forums-cdc86b3540e3a506e4382bafb56b27f5845bc67d.tar forums-cdc86b3540e3a506e4382bafb56b27f5845bc67d.tar.gz forums-cdc86b3540e3a506e4382bafb56b27f5845bc67d.tar.bz2 forums-cdc86b3540e3a506e4382bafb56b27f5845bc67d.tar.xz forums-cdc86b3540e3a506e4382bafb56b27f5845bc67d.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/docs/events.md
| -rw-r--r-- | phpBB/docs/events.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 893ed26f59..b1d96460a6 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -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 |