diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-22 19:01:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-22 19:04:32 +0200 |
| commit | 3425eeaf7d887c83cdcef3a621b0996432d19622 (patch) | |
| tree | bbe943fca3aec1f2acbbe0584d2febf81c68a666 /phpBB/phpbb/search/sphinx/config_variable.php | |
| parent | ed07f1b85eb95eb108987fc1a6187fa9bf311ace (diff) | |
| parent | f9cdec90fc184ce939c8b7ef6fc755e459456947 (diff) | |
| download | forums-3425eeaf7d887c83cdcef3a621b0996432d19622.tar forums-3425eeaf7d887c83cdcef3a621b0996432d19622.tar.gz forums-3425eeaf7d887c83cdcef3a621b0996432d19622.tar.bz2 forums-3425eeaf7d887c83cdcef3a621b0996432d19622.tar.xz forums-3425eeaf7d887c83cdcef3a621b0996432d19622.zip | |
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus
Merge branch 'ticket/12413' into ticket/12413-ascraeus
* ticket/12413:
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
Conflicts:
phpBB/feed.php
The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.
PHPBB3-12413
Diffstat (limited to 'phpBB/phpbb/search/sphinx/config_variable.php')
0 files changed, 0 insertions, 0 deletions