From 7c4d074a3cc3c204a135ae9aa69b5314980ea8b4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gmail.com> Date: Sat, 04 Jul 2015 16:19:36 -0400 Subject: [PATCH] Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurl --- 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