]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote branch 'statusnet/0.8.x' into 0.9.x
authorCraig Andrews <candrews@integralblue.com>
Sun, 11 Oct 2009 17:39:10 +0000 (13:39 -0400)
committerCraig Andrews <candrews@integralblue.com>
Sun, 11 Oct 2009 17:39:10 +0000 (13:39 -0400)
commitf719720e8ad3b09d664e33172bafef2b0fb91eea
treeef260a2b132405013025f61930c3850f498318c9
parent96d32fb8d0752c13cb1a768a3e4c3ad36a4a0188
parent006cfc528edab32548d1265df5dada09a1536aed
Merge remote branch 'statusnet/0.8.x' into 0.9.x

Conflicts:
lib/common.php
actions/groupsearch.php
actions/twitapistatuses.php
lib/default.php
lib/util.php