diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-10 12:12:07 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-10 12:12:07 +0200 |
| commit | 13017ce9e114d84ba9b4ced240e5648447fdfe45 (patch) | |
| tree | 5a4ae7b311319a239d9c6792cefc879b5558d1cc /apps/files_encryption/l10n/sk_SK.php | |
| parent | b25ab94a08ab9ba5e322043ac470d5352d456c71 (diff) | |
| parent | db06b906e50d7d1b7eca28f51db913af1fbc81f1 (diff) | |
| download | nextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.tar.gz nextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'apps/files_encryption/l10n/sk_SK.php')
0 files changed, 0 insertions, 0 deletions