]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
bad merge.. cleaning up missing webfinger bits
authorJames Walker <walkah@walkah.net>
Fri, 26 Feb 2010 08:43:35 +0000 (03:43 -0500)
committerJames Walker <walkah@walkah.net>
Fri, 26 Feb 2010 08:43:35 +0000 (03:43 -0500)
commitd1256b547f5f4f02ddc51a5fe2146dbde52aac53
tree9a8a15f46b4ae7cfeb1a820b14a03fa19c6f84ec
parent22062b665e6d883f5ddfe590af1b9b22833094b0
bad merge.. cleaning up missing webfinger bits
plugins/OStatus/actions/xrd.php
plugins/OStatus/lib/discovery.php