Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/tickets/QueryResult.java

@@ -24,6 +24,8 @@
import com.gitblit.models.TicketModel.Patchset;
import com.gitblit.models.TicketModel.Status;
import com.gitblit.models.TicketModel.Type;
import com.gitblit.models.TicketModel.Priority;
import com.gitblit.models.TicketModel.Severity;
import com.gitblit.utils.StringUtils;

/**
@@ -62,6 +64,8 @@
   public int commentsCount;
   public int votesCount;
   public int approvalsCount;
   public Priority priority;
   public Severity severity;

   public int docId;
   public int totalResults;