Merge branch 'master' into convert-oc_config

.htaccess

CONTRIBUTING.md

apps/files/ajax/newfile.php

apps/files/ajax/rename.php

apps/files/appinfo/app.php

apps/files/css/files.css

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/ar.php

apps/files/l10n/bn_BD.php

apps/files/l10n/ca.php

apps/files/l10n/cs_CZ.php

apps/files/l10n/cy_GB.php

apps/files/l10n/da.php

apps/files/l10n/de.php

apps/files/l10n/de_DE.php

apps/files/l10n/el.php

apps/files/l10n/en@pirate.php

apps/files/l10n/eo.php

apps/files/l10n/es.php