]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into pluginize-twitter-bridge
authorZach Copley <zach@controlyourself.ca>
Tue, 8 Sep 2009 23:02:57 +0000 (16:02 -0700)
committerZach Copley <zach@controlyourself.ca>
Tue, 8 Sep 2009 23:02:57 +0000 (16:02 -0700)
commit9d87313eaebe8240393ac300a435f3b1332c8849
tree6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a
parent5efe588174c71979fc1970353c9a556ea441f138
parentbeae3db41375879e725af053edf8041bbd76ac8c
Merge branch '0.9.x' into pluginize-twitter-bridge

Conflicts:
plugins/TwitterBridge/twitterauthorization.php
lib/common.php
lib/connectsettingsaction.php
lib/router.php
plugins/TwitterBridge/daemons/synctwitterfriends.php
plugins/TwitterBridge/daemons/twitterqueuehandler.php
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitter.php
plugins/TwitterBridge/twitterauthorization.php
plugins/TwitterBridge/twitteroauthclient.php
plugins/TwitterBridge/twittersettings.php