aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2018-11-18 11:21:07 +0100
committerMax Kostikov <max@kostikov.co>2018-11-18 11:21:07 +0100
commitc3f1aae5709db636b48cfb0cf779353394e82a69 (patch)
tree2171564b878b3d7ffabeeab99c03f1a47bfccc40 /Zotlabs
parent783cca1e13ae480b31ddcffce6f014fbd1cdc34a (diff)
parent0c94747ab1c740f47e5a796f5c60efcdfcd29ba1 (diff)
downloadvolse-hubzilla-c3f1aae5709db636b48cfb0cf779353394e82a69.tar.gz
volse-hubzilla-c3f1aae5709db636b48cfb0cf779353394e82a69.tar.bz2
volse-hubzilla-c3f1aae5709db636b48cfb0cf779353394e82a69.zip
Merge branch 'mod-zot-fix' into 'dev'
fix typo which prevented propagation of comments See merge request hubzilla/core!1399
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Zot.php b/Zotlabs/Module/Zot.php
index 8c34dced1..1cc0e54c9 100644
--- a/Zotlabs/Module/Zot.php
+++ b/Zotlabs/Module/Zot.php
@@ -19,7 +19,7 @@ class Zot extends \Zotlabs\Web\Controller {
function init() {
$zot = new ZotProtocol\Receiver(new ZotProtocol\Zot6Handler());
- json_return_and_die($zot->run(),'application/x-zot+jzon');
+ json_return_and_die($zot->run(),'application/x-zot+json');
}
}