From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 18 Oct 2013 08:49:59 -0400 Subject: [PATCH] Resolved differences from svn merge to trunk and git master --- interface/web/admin/lib/lang/cz_remote_user.lng | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng index 17c4f05..c75c165 100644 --- a/interface/web/admin/lib/lang/cz_remote_user.lng +++ b/interface/web/admin/lib/lang/cz_remote_user.lng @@ -45,3 +45,4 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.'; $wb['password_match_txt'] = 'Hesla se shodují.'; ?> + -- Gitblit v1.9.1