From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/mail/lib/lang/es_xmpp_user.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/mail/lib/lang/es_xmpp_user.lng b/interface/web/mail/lib/lang/es_xmpp_user.lng
index 9ee6398..8129b7a 100755
--- a/interface/web/mail/lib/lang/es_xmpp_user.lng
+++ b/interface/web/mail/lib/lang/es_xmpp_user.lng
@@ -12,4 +12,4 @@
 $wb['password_strength_txt'] = 'Seguridad de la contraseña';
 $wb['password_txt'] = 'Contraseña';
 $wb['repeat_password_txt'] = 'Repita la Contraseña';
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1