Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/wicket/pages/TicketPage.html

@@ -67,6 +67,8 @@
            <div style="border: 1px solid #ccc;padding: 10px;margin: 5px 0px;">

               <table class="summary" style="width: 100%">

                  <tr><th><wicket:message key="gb.type"></wicket:message></th><td><span wicket:id="ticketType">[type]</span></td></tr>

                  <tr><th><wicket:message key="gb.priority"></wicket:message></th><td><span wicket:id="priority">[priority]</span></td></tr>

                  <tr><th><wicket:message key="gb.severity"></wicket:message></th><td><span wicket:id="severity">[severity]</span></td></tr>

                  <tr><th><wicket:message key="gb.topic"></wicket:message></th><td><span wicket:id="ticketTopic">[topic]</span></td></tr>

                  <tr><th><wicket:message key="gb.responsible"></wicket:message></th><td><span wicket:id="responsible">[responsible]</span></td></tr>

                  <tr><th><wicket:message key="gb.milestone"></wicket:message></th><td><span wicket:id="milestone">[milestone]</span></td></tr>

@@ -554,7 +556,6 @@
      </div>

   </div>

</wicket:fragment>





<!-- VETOED PATCHSET FRAGMENT -->

<wicket:fragment wicket:id="vetoedFragment">