]> 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>
Thu, 24 Sep 2009 21:15:54 +0000 (17:15 -0400)
committerCraig Andrews <candrews@integralblue.com>
Thu, 24 Sep 2009 21:15:54 +0000 (17:15 -0400)
commit49bce941a9aae495ee7221bd367791227487b458
tree91858ee586473045158f6bb539e26af8168ecd84
parent3d30ad83f881a69d76b57a9af051fef308644987
parent5323956e388ebc2e4dfa1a5193aa670c96fff027
Merge remote branch 'statusnet/0.8.x' into 0.9.x

Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
EVENTS.txt
actions/newnotice.php
actions/showstream.php
classes/User.php
index.php
install.php
lib/action.php
lib/noticeform.php
lib/router.php
lib/util.php