diff options
author | Evan Prodromou <evan@status.net> | 2009-11-11 00:22:42 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-11 00:22:42 -0500 |
commit | 935410e8dc4c2d4d286a942cc27bbf8bc452fbdd (patch) | |
tree | 98e3a577b432232bdddcc30afa9ad8a61a28d301 /lib/default.php | |
parent | 1f5f5474f175a8248b362f8be4ff23bb5e971305 (diff) | |
parent | 093857c582a68b39e0d65523d27f25ede7b7fed6 (diff) |
Merge branch '0.9.x' into adminpanel
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/default.php b/lib/default.php index f6cc4b725..95366e0b3 100644 --- a/lib/default.php +++ b/lib/default.php @@ -125,10 +125,6 @@ $default = 'public' => array()), # JIDs of users who want to receive the public stream 'invite' => array('enabled' => true), - 'sphinx' => - array('enabled' => false, - 'server' => 'localhost', - 'port' => 3312), 'tag' => array('dropoff' => 864000.0), 'popular' => |