diff options
author | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
---|---|---|
committer | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
commit | 195b52cb63eda3d8e3af6195058a0e1403e4dede (patch) | |
tree | 4c79947d856f136051a84171eba913b1517a3bd1 /l10n/templates/user_ldap.pot | |
parent | c111a3aa248bee2bff22318c2a3d0da32ea0e451 (diff) | |
parent | d713948d3f85a6e0a369bf1a9052ce563250e3da (diff) | |
download | nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.tar.gz nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.zip |
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
Diffstat (limited to 'l10n/templates/user_ldap.pot')
-rw-r--r-- | l10n/templates/user_ldap.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 396d0c8eae2..d4c1c33115a 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.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-02-24 00:05+0100\n" +"POT-Creation-Date: 2013-02-25 00:05+0100\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" |