aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG9
-rw-r--r--doc/developer/zot_protocol.bb1
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fa9ea8812..53c23d539 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+Hubzilla 2.6.1 (2017-08-18)
+ - Fix a regression with dav clients
+ - Raise install requirements
+
+ Plugins/Addon
+ - Diaspora: fix PHP warning
+ - GNU-Social: fix PHP warning
+
+
Hubzilla 2.6 (2017-08-16)
- Upgrade to bootstrap-4 beta
- Consolidate disable_discover_tab config
diff --git a/doc/developer/zot_protocol.bb b/doc/developer/zot_protocol.bb
index 227c57a82..e9355bca8 100644
--- a/doc/developer/zot_protocol.bb
+++ b/doc/developer/zot_protocol.bb
@@ -276,7 +276,6 @@ Discovery returns a JSON array with the following components:
[h5]Permissions[/h5]
-
'permissions' => extensible array of permissions appropriate to this target, values are true or false
Permissions may include: