]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Tue, 16 Feb 2010 15:25:57 +0000 (10:25 -0500)
committerCraig Andrews <candrews@integralblue.com>
Tue, 16 Feb 2010 15:25:57 +0000 (10:25 -0500)
commit32084e33a266797b306158df29e48f057651b410
tree2a46e529783c8547aaae8ac00c8cac9bdfa61490
parent057ec1fceacbfec1f755a5bc6700a188aa70e33f
parentd4f6235d7b8a40bd1b51370e7eb405cdb14e61fb
Merge branch '0.9.x' into 1.0.x

Conflicts:
lib/queuemanager.php
actions/showstream.php
classes/User.php
classes/statusnet.ini
db/statusnet.sql
lib/queuemanager.php
lib/statusnet.php
lib/util.php