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

@@ -45,6 +45,7 @@ if(common_config('twitterbridge','enabled')) {
echo "ombqueuehandler.php ";
if (common_config('twitter', 'enabled')) {
echo "twitterqueuehandler.php ";
echo "synctwitterfriends.php ";
}
echo "facebookqueuehandler.php ";
echo "pingqueuehandler.php ";