From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/conf/mail/welcome_email_es.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/conf/mail/welcome_email_es.txt b/server/conf/mail/welcome_email_es.txt
new file mode 100644
index 0000000..4bcab80
--- /dev/null
+++ b/server/conf/mail/welcome_email_es.txt
@@ -0,0 +1,4 @@
+From: ISPConfig <postmaster@localhost.localdomain>
+Subject: Bienvenido a su nueva cuenta de correo
+
+Bienvenido a su nueva cuenta de correo. Su administrador.

--
Gitblit v1.9.1