Merge pull request #333 from nextcloud/sync-master

.mailmap

apps/dav/lib/CalDAV/CalDavBackend.php

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

apps/federatedfilesharing/lib/FederatedShareProvider.php

...federatedfilesharing/tests/FederatedShareProviderTest.php

apps/files/js/filelist.js

apps/files/tests/js/filelistSpec.js

apps/files_external/lib/Command/Backends.php

apps/files_sharing/js/sharedfilelist.js

apps/files_sharing/templates/list.php

apps/files_sharing/tests/MountProviderTest.php

apps/files_sharing/tests/js/sharedfilelistSpec.js

apps/files_versions/lib/Storage.php

apps/user_ldap/lib/User/Manager.php

apps/user_ldap/lib/User_LDAP.php

apps/user_ldap/templates/part.settingcontrols.php

apps/user_ldap/templates/part.wizardcontrols.php

build/integration/features/sharing-v1.feature

core/Application.php

core/Controller/OccController.php