]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 22 Mar 2010 19:37:45 +0000 (12:37 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 22 Mar 2010 19:37:45 +0000 (12:37 -0700)
commit26f49de0dd5673584e734152d2d3329b90eb6978
tree2ba00544c77cc3bfe0cafb4fa8fe60ce73d31d79
parentc85228eadc60b50ed6e7c9cba596c3e66f5214b2
parent27bfd1211d64298ee3c3b2d82d7b38ca1e1167ad
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
lib/attachmentlist.php
index.php
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php