harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zotlabs 2017-08-20 18:09:28 -07:00
commit 2b898537d7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -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) Hubzilla 2.6 (2017-08-16)
- Upgrade to bootstrap-4 beta - Upgrade to bootstrap-4 beta
- Consolidate disable_discover_tab config - Consolidate disable_discover_tab config

1
doc/developer/zot_protocol.bb
View File

@ -276,7 +276,6 @@ Discovery returns a JSON array with the following components:
[h5]Permissions[/h5] [h5]Permissions[/h5]
'permissions' => extensible array of permissions appropriate to this target, values are true or false 'permissions' => extensible array of permissions appropriate to this target, values are true or false
Permissions may include: Permissions may include: