summaryrefslogtreecommitdiff
path: root/sphinx.conf.sample
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
committerZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
commit9d87313eaebe8240393ac300a435f3b1332c8849 (patch)
tree6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /sphinx.conf.sample
parent5efe588174c71979fc1970353c9a556ea441f138 (diff)
parentbeae3db41375879e725af053edf8041bbd76ac8c (diff)
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts: plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'sphinx.conf.sample')
-rw-r--r--sphinx.conf.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx.conf.sample b/sphinx.conf.sample
index 8204b9db6..3de62f637 100644
--- a/sphinx.conf.sample
+++ b/sphinx.conf.sample
@@ -1,5 +1,5 @@
#
-# Minimal Sphinx configuration sample for laconica
+# Minimal Sphinx configuration sample for statusnet
#
source src1