aboutsummaryrefslogtreecommitdiffstats
path: root/doc/api_zot.md
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-12-05 20:16:19 -0500
committerAndrew Manning <tamanning@zoho.com>2016-12-05 20:16:19 -0500
commit8ba5cbc2b99ffed424d085b6365cbc07309ad573 (patch)
tree865cdc545673e1f5781a2ec42dbb6015ac251cf2 /doc/api_zot.md
parent3b3da24823defd89f4ed256b7c45df8b71cb0627 (diff)
parentfbf13dde213dcecfdc6c6e5d95b165bb46eda85a (diff)
downloadvolse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.gz
volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.bz2
volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.zip
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'doc/api_zot.md')
-rw-r--r--doc/api_zot.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/api_zot.md b/doc/api_zot.md
index 3ba536550..292539267 100644
--- a/doc/api_zot.md
+++ b/doc/api_zot.md
@@ -11,7 +11,11 @@ api/z/1.0/channel/export/basic
api/z/1.0/channel/stream
- Fetch conversation items
+ Fetch channel conversation items
+
+api/z/1.0/network/stream
+
+ Fetch network conversation items
api/z/1.0/files