diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 17:00:54 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 17:00:54 +0200 |
| commit | 7e0631b3b81a5669620122964d0326ead187de30 (patch) | |
| tree | 9370b9d5ac99f148d2bc724f76c805b772af7d2d /l10n/templates/lib.pot | |
| parent | 98ff8478301676c99ffefd5756ad22466dfb6acf (diff) | |
| parent | bd5cb1d801a16933b7b75af5c514caec2afa5fef (diff) | |
| download | nextcloud-server-7e0631b3b81a5669620122964d0326ead187de30.tar.gz nextcloud-server-7e0631b3b81a5669620122964d0326ead187de30.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/filelist.js
Diffstat (limited to 'l10n/templates/lib.pot')
| -rw-r--r-- | l10n/templates/lib.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 662cfdfdd6c..d10c7fb9fb3 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" +"POT-Creation-Date: 2013-09-18 11:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |