926c77246b
Conflicts: plugins/OStatus/classes/Ostatus_profile.php |
||
---|---|---|
.. | ||
FeedSub.php | ||
HubSub.php | ||
Magicsig.php | ||
Ostatus_profile.php | ||
Ostatus_source.php |
926c77246b
Conflicts: plugins/OStatus/classes/Ostatus_profile.php |
||
---|---|---|
.. | ||
FeedSub.php | ||
HubSub.php | ||
Magicsig.php | ||
Ostatus_profile.php | ||
Ostatus_source.php |