Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

This commit is contained in:
Sarven Capadisli 2009-06-18 18:48:56 +00:00
commit 95eff9c766

View File

@ -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.