summaryrefslogtreecommitdiffstats
path: root/l10n/mk/user_ldap.po
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-09-16 10:42:37 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-09-16 10:42:37 +0200
commit82cbbb8ab8cfe81559c45905d7fca819d71df346 (patch)
tree947d58076dae8d5c4d0bd001ccebbe079448e057 /l10n/mk/user_ldap.po
parent1558cb860c2fb26fdde14fce2a16acbb29d12b3e (diff)
parent46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff)
downloadnextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.tar.gz
nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.zip
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts: apps/files/index.php
Diffstat (limited to 'l10n/mk/user_ldap.po')
-rw-r--r--l10n/mk/user_ldap.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 323404d6364..c1df01027fb 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"