Merge branch 'master' into fix_glob_escaping
Conflicts: apps/files_trashbin/lib/trash.php
No related branches found
No related tags found
Showing
- 3rdparty 1 addition, 1 deletion3rdparty
- apps/files_encryption/l10n/ca.php 14 additions, 0 deletionsapps/files_encryption/l10n/ca.php
- apps/files_encryption/l10n/cs_CZ.php 5 additions, 0 deletionsapps/files_encryption/l10n/cs_CZ.php
- apps/files_encryption/l10n/es.php 1 addition, 0 deletionsapps/files_encryption/l10n/es.php
- apps/files_encryption/l10n/fr.php 8 additions, 0 deletionsapps/files_encryption/l10n/fr.php
- apps/files_encryption/l10n/gl.php 14 additions, 0 deletionsapps/files_encryption/l10n/gl.php
- apps/files_encryption/l10n/it.php 14 additions, 0 deletionsapps/files_encryption/l10n/it.php
- apps/files_encryption/l10n/ja_JP.php 14 additions, 0 deletionsapps/files_encryption/l10n/ja_JP.php
- apps/files_encryption/l10n/nl.php 9 additions, 0 deletionsapps/files_encryption/l10n/nl.php
- apps/files_encryption/l10n/sv.php 13 additions, 0 deletionsapps/files_encryption/l10n/sv.php
- apps/files_trashbin/lib/trash.php 8 additions, 1 deletionapps/files_trashbin/lib/trash.php
- apps/user_webdavauth/l10n/ar.php 0 additions, 1 deletionapps/user_webdavauth/l10n/ar.php
- apps/user_webdavauth/l10n/bg_BG.php 0 additions, 1 deletionapps/user_webdavauth/l10n/bg_BG.php
- apps/user_webdavauth/l10n/ca.php 1 addition, 1 deletionapps/user_webdavauth/l10n/ca.php
- apps/user_webdavauth/l10n/cs_CZ.php 0 additions, 1 deletionapps/user_webdavauth/l10n/cs_CZ.php
- apps/user_webdavauth/l10n/da.php 0 additions, 1 deletionapps/user_webdavauth/l10n/da.php
- apps/user_webdavauth/l10n/de.php 0 additions, 1 deletionapps/user_webdavauth/l10n/de.php
- apps/user_webdavauth/l10n/de_DE.php 0 additions, 1 deletionapps/user_webdavauth/l10n/de_DE.php
- apps/user_webdavauth/l10n/el.php 0 additions, 1 deletionapps/user_webdavauth/l10n/el.php
- apps/user_webdavauth/l10n/eo.php 1 addition, 2 deletionsapps/user_webdavauth/l10n/eo.php
Loading
Please register or sign in to comment