926c77246b
Conflicts: plugins/OStatus/classes/Ostatus_profile.php |
||
---|---|---|
.. | ||
discovery.php | ||
discoveryhints.php | ||
feeddiscovery.php | ||
hubconfqueuehandler.php | ||
huboutqueuehandler.php | ||
hubprepqueuehandler.php | ||
linkheader.php | ||
magicenvelope.php | ||
ostatusqueuehandler.php | ||
pushinqueuehandler.php | ||
salmon.php | ||
salmonaction.php | ||
salmonqueuehandler.php | ||
xrd.php | ||
xrdaction.php |