diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-03-08 21:44:30 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-03-08 21:44:30 +0530 |
| commit | 3b6d37131025f04caf998c26316497ebd4a37a4d (patch) | |
| tree | 768d0b3b59bc24b6bf3aaef3fc388b7459c20eb9 /phpBB/includes/diff/diff.php | |
| parent | 9100f4ebbfba9a4eb7a91e545bf85a3982ffc0dd (diff) | |
| parent | c51dcbe6a0cd6e15456ac80b2bdfe13d94f27f07 (diff) | |
| download | forums-3b6d37131025f04caf998c26316497ebd4a37a4d.tar forums-3b6d37131025f04caf998c26316497ebd4a37a4d.tar.gz forums-3b6d37131025f04caf998c26316497ebd4a37a4d.tar.bz2 forums-3b6d37131025f04caf998c26316497ebd4a37a4d.tar.xz forums-3b6d37131025f04caf998c26316497ebd4a37a4d.zip | |
Merge branch 'ticket/10945' into ticket/10945-develop
* ticket/10945:
[ticket/10945] Fix return values for split_keywords function
[ticket/10945] Display search query when search fails in native search
[ticket/10945] remove trigger_error call
Conflicts:
phpBB/phpbb/search/fulltext_native.php
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions