]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote branch 'statusnet/testing' into testing
authorJames Walker <walkah@walkah.net>
Fri, 26 Feb 2010 04:49:45 +0000 (23:49 -0500)
committerJames Walker <walkah@walkah.net>
Fri, 26 Feb 2010 04:49:45 +0000 (23:49 -0500)
commit7c8031dc4bf6ece83db893e13d89ced10c2f6b62
tree9b48e3d511642450ac0566b00cfb6f2d8ae109aa
parent855692141d531287b179841b8816e90023b6ba7b
parent02300ebfb08bfcd52f4ab34d1041455079ebf2ec
Merge remote branch 'statusnet/testing' into testing

Conflicts:
plugins/OStatus/lib/webfinger.php
plugins/OStatus/actions/xrd.php
plugins/OStatus/classes/Ostatus_profile.php