WebDAV Permissions: Distinguish between renameing and moving
Sort the result before comparing
Merge pull request #8529 from owncloud/remove-legacy-routing

Remove legacy routing code
Merge pull request #8897 from owncloud/fix-multiselect

fix files multiselect bar now that the app list is gone
improve share settings working
This settings doesn't belong together

Revert "make reshare settings foldable"

This reverts commit c01f196f723dcb3dea6947c821a70d4d80563bbd.

Conflicts:
	settings/templates/admin.php
unify share settings
Verify that we have a valid storage in View->getPath
Merge pull request #8891 from owncloud/design-emptycontent

fix size and unbold empty content message
fix typo in var name
fix unit tests
reenable checkCode()
Merge pull request #8902 from owncloud/fix_ldap_typo_2

fix typo in var name
Merge pull request #8893 from owncloud/feature/get-users-by-preference

Add method to get users by their preference
allow to set pre-condition for setValue
use oc_preferences instead of oc_encryption to store encyption settings
adding unit tests for encryption data migration
close sidebar when switching navigation entry, except on add or change settings
fix position of sidebar toggle, fix Files controls position problems
Merge pull request #8865 from owncloud/improve_share_settings

Improve share settings