From 2a81bdf4c10f6394c052457303a82f925209e3f3 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 12 Mar 2014 21:16:15 -0400 Subject: [PATCH] Merged #27 "Fix ticket page IOBE when Gitblit is not serving repositories" --- 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