summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions/xrd.php
AgeCommit message (Collapse)Author
2010-02-25Merge remote branch 'statusnet/testing' into testingJames Walker
Conflicts: plugins/OStatus/lib/webfinger.php
2010-02-25moving webfinger action to xrdactionJames Walker