From dcd6541d4e7a159e7478962121fbfd0782568af0 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 09 Jun 2014 12:36:09 -0400 Subject: [PATCH] Switch to basic ant copy filter for web.xml --- 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