From 1f4cd6d6b68085d007519d7c43daf10e3d4b2085 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 09 Mar 2014 10:55:13 -0400 Subject: [PATCH] Merge pull request #160 from Mrbytes/master --- src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties index 602c79d..791b286 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties @@ -668,4 +668,5 @@ gb.repositoryIsFrozen = Este Repositorio est\u00E1 congelado. gb.repositoryDoesNotAcceptPatchsets = Este Repositorio no acepta parches. gb.serverDoesNotAcceptPatchsets = Este Servidor-Git no acepta parches. -gb.ticketIsClosed = Este ticket est\u00E1 cerrado. \ No newline at end of file +gb.ticketIsClosed = Este ticket est\u00E1 cerrado. +gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches \ No newline at end of file -- Gitblit v1.9.1