Merge branch 'master' into updater-CSP
Conflicts: core/templates/update.php
Showing
- apps/files/admin.php 0 additions, 4 deletionsapps/files/admin.php
- apps/files/ajax/delete.php 7 additions, 16 deletionsapps/files/ajax/delete.php
- apps/files/ajax/getstoragestats.php 1 addition, 8 deletionsapps/files/ajax/getstoragestats.php
- apps/files/ajax/upload.php 35 additions, 52 deletionsapps/files/ajax/upload.php
- apps/files/appinfo/routes.php 1 addition, 4 deletionsapps/files/appinfo/routes.php
- apps/files/download.php 0 additions, 3 deletionsapps/files/download.php
- apps/files/index.php 8 additions, 0 deletionsapps/files/index.php
- apps/files/js/filelist.js 15 additions, 18 deletionsapps/files/js/filelist.js
- apps/files/js/files.js 42 additions, 33 deletionsapps/files/js/files.js
- apps/files/js/publiclistview.php 0 additions, 20 deletionsapps/files/js/publiclistview.php
- apps/files/l10n/ar.php 1 addition, 1 deletionapps/files/l10n/ar.php
- apps/files/l10n/bg_BG.php 1 addition, 1 deletionapps/files/l10n/bg_BG.php
- apps/files/l10n/bn_BD.php 1 addition, 2 deletionsapps/files/l10n/bn_BD.php
- apps/files/l10n/ca.php 4 additions, 2 deletionsapps/files/l10n/ca.php
- apps/files/l10n/cs_CZ.php 1 addition, 2 deletionsapps/files/l10n/cs_CZ.php
- apps/files/l10n/da.php 1 addition, 1 deletionapps/files/l10n/da.php
- apps/files/l10n/de.php 1 addition, 2 deletionsapps/files/l10n/de.php
- apps/files/l10n/de_DE.php 1 addition, 2 deletionsapps/files/l10n/de_DE.php
- apps/files/l10n/el.php 1 addition, 2 deletionsapps/files/l10n/el.php
- apps/files/l10n/eo.php 1 addition, 2 deletionsapps/files/l10n/eo.php
Loading
Please register or sign in to comment