Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
x
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
Revert "x"

This reverts commit f84453497bd5ef4eba8bca84917b8e82d784937a.
new function hubloc_change_primary()
Merge https://github.com/friendica/red into pending_merge
Merge pull request #638 from dawnbreak/RedDAV

When you delete something in /cloud stay in the right folder.
sql
Merge https://github.com/friendica/red into pending_merge
this bug has been there for a *long* time. First time I've ever seen it triggered.
more diagnostic when changing primary