Merge branch 'master' into fix_minor_files_annoyances
Conflicts: apps/files/js/files.js
Showing
- apps/files/admin.php 3 additions, 4 deletionsapps/files/admin.php
- apps/files/ajax/rename.php 1 addition, 1 deletionapps/files/ajax/rename.php
- apps/files/ajax/upload.php 6 additions, 5 deletionsapps/files/ajax/upload.php
- apps/files/js/filelist.js 1 addition, 1 deletionapps/files/js/filelist.js
- apps/files/js/files.js 16 additions, 4 deletionsapps/files/js/files.js
- apps/files/l10n/bn_BD.php 46 additions, 0 deletionsapps/files/l10n/bn_BD.php
- apps/files/l10n/ca.php 3 additions, 0 deletionsapps/files/l10n/ca.php
- apps/files/l10n/cs_CZ.php 1 addition, 0 deletionsapps/files/l10n/cs_CZ.php
- apps/files/l10n/da.php 1 addition, 0 deletionsapps/files/l10n/da.php
- apps/files/l10n/de.php 3 additions, 0 deletionsapps/files/l10n/de.php
- apps/files/l10n/de_DE.php 3 additions, 0 deletionsapps/files/l10n/de_DE.php
- apps/files/l10n/el.php 1 addition, 0 deletionsapps/files/l10n/el.php
- apps/files/l10n/eo.php 1 addition, 0 deletionsapps/files/l10n/eo.php
- apps/files/l10n/es.php 3 additions, 0 deletionsapps/files/l10n/es.php
- apps/files/l10n/es_AR.php 3 additions, 0 deletionsapps/files/l10n/es_AR.php
- apps/files/l10n/et_EE.php 1 addition, 0 deletionsapps/files/l10n/et_EE.php
- apps/files/l10n/eu.php 1 addition, 0 deletionsapps/files/l10n/eu.php
- apps/files/l10n/fa.php 1 addition, 0 deletionsapps/files/l10n/fa.php
- apps/files/l10n/fi_FI.php 3 additions, 0 deletionsapps/files/l10n/fi_FI.php
- apps/files/l10n/fr.php 2 additions, 1 deletionapps/files/l10n/fr.php
Loading
Please register or sign in to comment