From c8fe8bd2326b35069a2078fd6d1b74f1d0282707 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 08 Mar 2014 09:17:58 -0500
Subject: [PATCH] Merge pull request #152 from ds5apn/master

---
 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