From 032d8228dd61867c792c655e506aa8fae7026fd9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 15 May 2014 13:29:17 -0400 Subject: [PATCH] Merged #78 "Process bugtraq in the ticket description and comments" --- src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties index 37d62e5..c669f3f 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties @@ -669,3 +669,4 @@ gb.repositoryDoesNotAcceptPatchsets = Deze repositorie accepteert geen patchsets. gb.serverDoesNotAcceptPatchsets = Deze server accepteert geen patchsets. gb.ticketIsClosed = Deze ticket is gesloten. +gb.mergeToDescription = default integratie branch voor het mergen van ticket patchsets -- Gitblit v1.9.1