From c51db7be8f6f48ddebff5053915be68f77e3fc94 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 09:20:25 -0400
Subject: [PATCH] Merged #85 "Tag server-side merges when incremental push tags are enabled"

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
index 8a725cf..a6d6184 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
@@ -670,3 +670,5 @@
 gb.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets.
 gb.ticketIsClosed = Ce ticket est clos.
 gb.mergeToDescription = default integration branch for merging ticket patchsets
+gb.myTickets = mes tickets
+gb.yourAssignedTickets = dont vous �tes responsable

--
Gitblit v1.9.1