]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'twitter-oauth' into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Mon, 10 Aug 2009 07:49:51 +0000 (07:49 +0000)
committerZach Copley <zach@controlyourself.ca>
Mon, 10 Aug 2009 07:49:51 +0000 (07:49 +0000)
commit17dcf1c3170bc905e3b0fdffc804d6f7229ac61b
tree6a236c91314d3576b19493e42a9773a7610cce69
parentc1b19929f6234c4b9e30e16bae419c89c38c1169
parent06c5f490ea509f3a5222f42ee561c9b4f337af8e
Merge branch 'twitter-oauth' into 0.8.x

Conflicts:

scripts/getvaliddaemons.php
actions/twittersettings.php
config.php.sample
lib/common.php
lib/mail.php
lib/router.php
scripts/getvaliddaemons.php