diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-01 09:31:26 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-01 09:31:26 +0200 |
| commit | 3579ba1e414da72f1975845b4963adde2869e0a8 (patch) | |
| tree | fa6e587258d53be908b6863b8941ae1f94553d58 /apps/files_encryption/js/settings-admin.js | |
| parent | 06a5cf70f723b95e46beb2f1b167ec9a6db9b079 (diff) | |
| parent | 6163a85668d0dced5c3644e3cc2b084e3e8d8541 (diff) | |
| download | nextcloud-server-3579ba1e414da72f1975845b4963adde2869e0a8.tar.gz nextcloud-server-3579ba1e414da72f1975845b4963adde2869e0a8.zip | |
Merge branch 'master' into files_encryption
Conflicts:
apps/user_ldap/l10n/nn_NO.php
core/l10n/es.php
core/l10n/et_EE.php
core/l10n/ja_JP.php
core/l10n/nn_NO.php
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_encryption.po
l10n/cy_GB/files_external.po
l10n/cy_GB/files_sharing.po
l10n/cy_GB/files_trashbin.po
l10n/cy_GB/lib.po
l10n/cy_GB/settings.po
l10n/de_DE/core.po
l10n/es/core.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/gl/core.po
l10n/it/core.po
l10n/ja_JP/core.po
l10n/ja_JP/settings.po
l10n/nn_NO/core.po
l10n/nn_NO/user_ldap.po
l10n/pt_BR/core.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/zh_TW/files_sharing.po
settings/l10n/et_EE.php
Diffstat (limited to 'apps/files_encryption/js/settings-admin.js')
0 files changed, 0 insertions, 0 deletions