summaryrefslogtreecommitdiffstats
path: root/l10n/de_DE/user_ldap.po
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-18 00:38:52 +0200
committerkondou <kondou@ts.unde.re>2013-08-18 00:38:52 +0200
commitedd92e4c09151238a89816186914f9382293ab9b (patch)
treee25d87cecf45ff2c2189198e5369f7754e01873a /l10n/de_DE/user_ldap.po
parent1348330c7d75d2b60d845a43be57dedc6199ea1a (diff)
parent12f4494de02457d51004ca6a82c1b2160189819f (diff)
downloadnextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.tar.gz
nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.zip
Merge branch 'master' into fix_jslint_kondou
Conflicts: apps/files/js/file-upload.js
Diffstat (limited to 'l10n/de_DE/user_ldap.po')
-rw-r--r--l10n/de_DE/user_ldap.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index c5b9e86c3ad..e6a37a71fc4 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 12:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"