external storage: fix merge conflict, indentation

.gitignore

.gitmodules

apps/files/ajax/download.php

apps/files/ajax/getstoragestats.php

apps/files/ajax/list.php

apps/files/ajax/rawlist.php

apps/files/appinfo/remote.php

apps/files/command/scan.php

apps/files/css/files.css

apps/files/css/mobile.css

apps/files/index.php

apps/files/js/fileactions.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/ru.php

apps/files/templates/index.php

apps/files/templates/part.breadcrumb.php

apps/files_encryption/l10n/ru.php

apps/files_encryption/lib/proxy.php

apps/files_external/js/settings.js