diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-20 18:09:28 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-08-20 18:09:28 -0700 |
| commit | 2b898537d72b94c98a149811f2a8dd72bcddcda1 (patch) | |
| tree | 644a791986a0c4754fbf2e4f38b2b9175f21367d | |
| parent | 081bff605a47e4e46f1842f81697386459792e11 (diff) | |
| parent | 830f1bcd50ca7b5501f9241a34b516f875cc9f03 (diff) | |
| download | volse-hubzilla-2b898537d72b94c98a149811f2a8dd72bcddcda1.tar.gz volse-hubzilla-2b898537d72b94c98a149811f2a8dd72bcddcda1.tar.bz2 volse-hubzilla-2b898537d72b94c98a149811f2a8dd72bcddcda1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rw-r--r-- | CHANGELOG | 9 | ||||
| -rw-r--r-- | doc/developer/zot_protocol.bb | 1 |
2 files changed, 9 insertions, 1 deletions
@@ -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: |