6081bfa2bc
Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php |
||
---|---|---|
.. | ||
files | ||
files_encryption | ||
files_external | ||
files_sharing | ||
files_versions | ||
user_ldap | ||
user_webdavauth |