diff options
| author | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
| commit | 47fba5827bd106f53625b543f30643ca5ba1c16e (patch) | |
| tree | bef05781eacc6dbc67d03899e0dde0257ce58096 /Zotlabs/Module/Wfinger.php | |
| parent | 47f75ad8bfbe8325a76ae6fe466aa8080fc87045 (diff) | |
| parent | 516167c0f8579c8a068b6e52557e7e1109f897ae (diff) | |
| download | volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.gz volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.bz2 volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Lib/ThreadItem.php
Diffstat (limited to 'Zotlabs/Module/Wfinger.php')
| -rw-r--r-- | Zotlabs/Module/Wfinger.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index 03275abbc..a19bdbedc 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -128,7 +128,7 @@ class Wfinger extends \Zotlabs\Web\Controller { 'http://webfinger.net/ns/name' => $r[0]['channel_name'], 'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'], 'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'], - 'http://purl.org/zot/federation' => 'zot' + 'http://purl.org/zot/federation' => 'zot,zot6' ]; foreach($aliases as $alias) |