Conflicts: apps/files_external/js/settings.js apps/files_external/lib/smb.php apps/files_external/templates/settings.php lib/files/storage/common.php