summaryrefslogtreecommitdiff
path: root/config.php.sample
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-05-07 16:07:55 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-05-07 16:07:55 +0000
commitc7d6e5b0157e1bab08351a326d09259476c06b70 (patch)
tree597c6e6cbbcd24e6768d5284eda143db24ceb090 /config.php.sample
parent6b064e40a78c7c6252433d60b08040f108570e8b (diff)
parent5771f413bb28502540d3bc017bc58433e9b0abf9 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'config.php.sample')
-rw-r--r--config.php.sample3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.php.sample b/config.php.sample
index b8ed45fa8..6d6a9b533 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -150,6 +150,9 @@ $config['sphinx']['port'] = 3312;
#$config['memcached']['server'] = 'localhost';
#$config['memcached']['port'] = 11211;
+# Enable bidirectional Twitter bridge
+#$config['twitterbridge']['enabled'] = true;
+
#Twitter integration source attribute. Note: default is Laconica
#$config['integration']['source'] = 'Laconica';