]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6f95ccd f2fd8b3)
Merge branch '0.9.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 9 Sep 2010 19:01:03 +0000 (15:01 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 9 Sep 2010 19:01:03 +0000 (15:01 -0400)
commit4419e43f7f62d92f01ba8f844aa9cd472051dd84
tree4c80501a0306c1cddd2427685824bef62683020btree | snapshot
parent6f95ccd37de1f7e2063206e87c93cbe06097eae7commit | diff
parentf2fd8b36f4a932f50770c84d769297bcfc1c1483commit | diff
Merge branch '0.9.x' into 1.0.x

Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
EVENTS.txt diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
classes/Notice.php diff1 | diff2 | blob | history
lib/apiaction.php diff1 | diff2 | blob | history
lib/common.php diff1 | diff2 | blob | history
plugins/TwitterBridge/twitteroauthclient.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)