From 50922784c5d6b5206a830c73b467e1551f4cda5c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 03 May 2016 09:14:18 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

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

diff --git a/interface/web/admin/lib/lang/es_software_repo.lng b/interface/web/admin/lib/lang/es_software_repo.lng
index 46675a6..26382bd 100755
--- a/interface/web/admin/lib/lang/es_software_repo.lng
+++ b/interface/web/admin/lib/lang/es_software_repo.lng
@@ -5,4 +5,4 @@
 $wb['repo_url_txt'] = 'URL';
 $wb['repo_username_txt'] = 'Usuario (opcional)';
 $wb['Software Repository which may contain addons or updates'] = 'Repositorio de aplicaciones que puede contener complementos o actualizaciones';
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1