Merge branch 'master' into convert-oc_config
Conflicts: lib/config.php
Showing
- apps/files/l10n/de_DE.php 3 additions, 0 deletionsapps/files/l10n/de_DE.php
- apps/files/l10n/fr.php 3 additions, 0 deletionsapps/files/l10n/fr.php
- apps/files/l10n/it.php 1 addition, 0 deletionsapps/files/l10n/it.php
- apps/files/l10n/sv.php 3 additions, 0 deletionsapps/files/l10n/sv.php
- apps/files/l10n/zh_CN.php 1 addition, 0 deletionsapps/files/l10n/zh_CN.php
- apps/files_encryption/appinfo/app.php 2 additions, 3 deletionsapps/files_encryption/appinfo/app.php
- apps/files_encryption/files/error.php 0 additions, 1 deletionapps/files_encryption/files/error.php
- apps/files_encryption/hooks/hooks.php 4 additions, 4 deletionsapps/files_encryption/hooks/hooks.php
- apps/files_encryption/l10n/eu.php 19 additions, 1 deletionapps/files_encryption/l10n/eu.php
- apps/files_encryption/l10n/fi_FI.php 1 addition, 0 deletionsapps/files_encryption/l10n/fi_FI.php
- apps/files_encryption/l10n/gl.php 1 addition, 0 deletionsapps/files_encryption/l10n/gl.php
- apps/files_encryption/l10n/it.php 1 addition, 0 deletionsapps/files_encryption/l10n/it.php
- apps/files_encryption/l10n/sl.php 1 addition, 0 deletionsapps/files_encryption/l10n/sl.php
- apps/files_encryption/l10n/sv.php 8 additions, 0 deletionsapps/files_encryption/l10n/sv.php
- apps/files_encryption/l10n/zh_CN.php 1 addition, 0 deletionsapps/files_encryption/l10n/zh_CN.php
- apps/files_encryption/lib/helper.php 18 additions, 2 deletionsapps/files_encryption/lib/helper.php
- apps/files_external/l10n/eu.php 1 addition, 0 deletionsapps/files_external/l10n/eu.php
- apps/files_sharing/l10n/it.php 1 addition, 1 deletionapps/files_sharing/l10n/it.php
- apps/files_sharing/public.php 1 addition, 1 deletionapps/files_sharing/public.php
- apps/files_sharing/templates/authenticate.php 3 additions, 0 deletionsapps/files_sharing/templates/authenticate.php
Loading
Please register or sign in to comment