diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-27 14:41:53 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-27 14:41:53 +0200 |
| commit | 80433fc4c4b052d788d9a942ce9d332b0f526362 (patch) | |
| tree | b12d522f99cdec249af1fb3bd4b00d7bd14a9c87 /l10n/es/files.po | |
| parent | 89f0c8f39d99b4c2bf0fb9dac1ad11cbe0781a3b (diff) | |
| parent | 5e243b48bb51e94daa3ba32c9175945d579040c8 (diff) | |
| download | nextcloud-server-80433fc4c4b052d788d9a942ce9d332b0f526362.tar.gz nextcloud-server-80433fc4c4b052d788d9a942ce9d332b0f526362.zip | |
Merge branch 'master' into file_encryption_util_is_error
Conflicts:
apps/files_encryption/lib/util.php
Diffstat (limited to 'l10n/es/files.po')
| -rw-r--r-- | l10n/es/files.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/es/files.po b/l10n/es/files.po index b959c11dfa1..46cecf3a244 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:01+0200\n" -"PO-Revision-Date: 2013-05-24 23:25+0000\n" +"POT-Creation-Date: 2013-05-27 02:00+0200\n" +"PO-Revision-Date: 2013-05-26 23:15+0000\n" "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" |