Merge branch 'twitter-oauth' into 0.8.x

Conflicts:

	scripts/getvaliddaemons.php
This commit is contained in:
Zach Copley
2009-08-10 07:49:51 +00:00
14 changed files with 1384 additions and 893 deletions

View File

@@ -182,6 +182,10 @@ $config['sphinx']['port'] = 3312;
//
// $config['twitterbridge']['enabled'] = true;
// Twitter OAuth settings
// $config['twitter']['consumer_key'] = 'YOURKEY';
// $config['twitter']['consumer_secret'] = 'YOURSECRET';
// 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.