summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-06-18 18:48:56 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-06-18 18:48:56 +0000
commit95eff9c76606509de19db36c78c66ac68f87cf12 (patch)
tree4c00d6b5cc09a271d0b47fad377a080a07ccf643
parent730c173238841cdc4d52bb074e53d4a74f7871bf (diff)
parentbde571728d5471feeb1d6ae0647b5f09346e6d5c (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
-rw-r--r--config.php.sample3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.php.sample b/config.php.sample
index 7649c5262..529164108 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -153,6 +153,9 @@ $config['sphinx']['port'] = 3312;
// Twitter integration source attribute. Note: default is Laconica
// $config['integration']['source'] = 'Laconica';
+// Enable bidirectional Twitter bridge
+// $config['twitterbridge']['enabled'] = true;
+
// Edit throttling. Off by default. If turned on, you can only post 20 notices
// every 10 minutes. Admins may want to play with the settings to minimize inconvenience for
// real users without getting uncontrollable floods from spammers or runaway bots.