Merge branch 'master' into files_encryption_upgrade_fix
Conflicts: apps/files_encryption/tests/crypt.php
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 2 deletions.gitignore
- apps/files/appinfo/app.php 1 addition, 1 deletionapps/files/appinfo/app.php
- apps/files/css/files.css 16 additions, 5 deletionsapps/files/css/files.css
- apps/files/js/filelist.js 1 addition, 1 deletionapps/files/js/filelist.js
- apps/files/l10n/cs_CZ.php 1 addition, 0 deletionsapps/files/l10n/cs_CZ.php
- apps/files/l10n/de.php 1 addition, 0 deletionsapps/files/l10n/de.php
- apps/files/l10n/he.php 7 additions, 0 deletionsapps/files/l10n/he.php
- apps/files/l10n/hi.php 4 additions, 0 deletionsapps/files/l10n/hi.php
- apps/files/l10n/lt_LT.php 25 additions, 1 deletionapps/files/l10n/lt_LT.php
- apps/files/l10n/ru.php 1 addition, 0 deletionsapps/files/l10n/ru.php
- apps/files/l10n/sv.php 1 addition, 0 deletionsapps/files/l10n/sv.php
- apps/files/templates/part.list.php 2 additions, 2 deletionsapps/files/templates/part.list.php
- apps/files_encryption/hooks/hooks.php 9 additions, 0 deletionsapps/files_encryption/hooks/hooks.php
- apps/files_encryption/l10n/ca.php 19 additions, 1 deletionapps/files_encryption/l10n/ca.php
- apps/files_encryption/l10n/cs_CZ.php 19 additions, 1 deletionapps/files_encryption/l10n/cs_CZ.php
- apps/files_encryption/l10n/de.php 14 additions, 1 deletionapps/files_encryption/l10n/de.php
- apps/files_encryption/l10n/de_DE.php 12 additions, 1 deletionapps/files_encryption/l10n/de_DE.php
- apps/files_encryption/l10n/el.php 9 additions, 1 deletionapps/files_encryption/l10n/el.php
- apps/files_encryption/l10n/es.php 19 additions, 1 deletionapps/files_encryption/l10n/es.php
- apps/files_encryption/l10n/fr.php 19 additions, 1 deletionapps/files_encryption/l10n/fr.php
Loading
Please register or sign in to comment