diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-14 20:57:29 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-14 20:57:29 +0100 |
| commit | 617dc0e468cd285a28f337c565f9f9ae1aa2e85f (patch) | |
| tree | d239833a66fb38a5f46f0b5bdb353ff478e267ca /l10n/eo/settings.po | |
| parent | 99ee95d46c3e14cb902493df3201a2c1ad9d6dc5 (diff) | |
| parent | ecc7b01cee466d4893f8199abaee363c6bc4dac9 (diff) | |
| download | nextcloud-server-617dc0e468cd285a28f337c565f9f9ae1aa2e85f.tar.gz nextcloud-server-617dc0e468cd285a28f337c565f9f9ae1aa2e85f.zip | |
Merge branch 'master' into moviepreviewfallback
Conflicts:
lib/private/preview/movies.php
Diffstat (limited to 'l10n/eo/settings.po')
| -rw-r--r-- | l10n/eo/settings.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index d9044aa0db6..32798c9af34 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-11-06 21:43-0500\n" -"PO-Revision-Date: 2013-11-07 02:43+0000\n" +"POT-Creation-Date: 2013-11-11 05:45-0500\n" +"PO-Revision-Date: 2013-11-11 08:12+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" |