66b1ad0a9b
Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php |
||
---|---|---|
.. | ||
files | ||
files_encryption | ||
files_external | ||
files_sharing | ||
files_trashbin | ||
files_versions | ||
user_ldap | ||
user_webdavauth |