Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-08-20 18:09:28 -07:00 · 2017-08-20 18:09:28 -07:00 · 2b898537d7
commit 2b898537d7
parent 081bff605a 830f1bcd50
2 changed files with 9 additions and 1 deletions
--- a/9
+++ b/9
@ -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
--- 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: