summaryrefslogtreecommitdiff
path: root/lib/default.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-10 17:08:59 -0500
committerEvan Prodromou <evan@status.net>2009-11-10 17:08:59 -0500
commit1455d60b06df11f7b765040a4195ded288711ae0 (patch)
treeb083992e9509c9bdabfacc0368eac0106f22496e /lib/default.php
parent7ee6160a5b4a843a266a3455351ab2a5d59294a2 (diff)
parent53c86c43c4b8cba313335f5d70f7f77d4ab640d2 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
-rw-r--r--lib/default.php4
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' =>