aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-04-18 20:59:41 +0200
committerMax Kostikov <max@kostikov.co>2019-04-18 20:59:41 +0200
commit6c93518ef733a28ef06451193fbad8d964ac4127 (patch)
treeb2d171a51df1352f2fac86b903012a7f046cb967 /Zotlabs
parentb7cb2a295148f64ad56a3d428f7a781a232601fd (diff)
parentdf5a1c59e6d2a0921de177aabacbee674d7385da (diff)
downloadvolse-hubzilla-6c93518ef733a28ef06451193fbad8d964ac4127.tar.gz
volse-hubzilla-6c93518ef733a28ef06451193fbad8d964ac4127.tar.bz2
volse-hubzilla-6c93518ef733a28ef06451193fbad8d964ac4127.zip
Merge branch 'dev' into 'dev'
add attachments to zot6 event objects, add zot6 to federated transports (webfinger) See merge request hubzilla/core!1593
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wfinger.php2
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)