From f7e1ff4ddd3744ebebcdf4c37b2392ff34265d29 Mon Sep 17 00:00:00 2001
From: Dongsu, KIM <ds5apn@gmail.com>
Date: Sat, 08 Mar 2014 22:12:59 -0500
Subject: [PATCH] Added Korean translation gb.mergeToDescription and improved some strings

---
 src/main/java/com/gitblit/models/TicketModel.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index 1ff55dd..5fd1ed9 100644
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -1207,7 +1207,7 @@
 
 		public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, On_Hold };
 
-		public static Status [] proposalWorkflow = { Open, Declined, On_Hold};
+		public static Status [] proposalWorkflow = { Open, Resolved, Declined, On_Hold};
 
 		@Override
 		public String toString() {

--
Gitblit v1.9.1