]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' into testing
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 24 Aug 2009 20:55:49 +0000 (16:55 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 24 Aug 2009 20:55:49 +0000 (16:55 -0400)
commitff87732053bae38879988ba7d002a294998ccb4e
treeccccfe7fc8976baf1f0cd4438a57bf817dc4052c
parent27aeba01dd366f15f7847267b7518fb873987ddb
parentf3cdc7f272e409d391979d3e6c58dd63573530c0
Merge branch '0.8.x' into testing

Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
actions/twitterauthorization.php
classes/Foreign_link.php
lib/common.php
lib/mail.php
lib/twitter.php
scripts/twitterstatusfetcher.php