diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-11-24 13:01:01 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-11-24 13:01:01 +0100 |
| commit | f865d6e5dab19122fffc677da495b21d3d5e93e7 (patch) | |
| tree | 8631750db2c385438207326479350ea909a625b4 /Zotlabs/Module/Wfinger.php | |
| parent | 0bba9482dfbcc0fd8bea880ac3820548281ecfc2 (diff) | |
| parent | bc9f2922e0e255e97cb607d099f60c8a81c4736f (diff) | |
| download | volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.gz volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.bz2 volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.zip | |
Resolved merge conflicts
Diffstat (limited to 'Zotlabs/Module/Wfinger.php')
| -rw-r--r-- | Zotlabs/Module/Wfinger.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index 1866bce40..e4591df12 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -205,6 +205,12 @@ class Wfinger extends \Zotlabs\Web\Controller { ], [ + 'rel' => 'http://purl.org/zot/protocol/6.0', + 'type' => 'application/x-zot+json', + 'href' => channel_url($r[0]) + ], + + [ 'rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-zot+json', 'href' => z_root() . '/owa', |