]> 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>
Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
commit7e2af3dcae956c7490df74be8d94fa09a4bab673
tree2947bedd07061d2a0bab755c97445b30b4588ed4
parent5a0125691bd4002c38e83f29dd2721cb07b2027e
parentc84c4c6839c1791775cc698ad488bc23ed956d5b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
lib/activity.php
plugins/OStatus/classes/Ostatus_profile.php