Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -39,6 +39,8 @@
            </div>

         </td></tr>

         <tr wicket:id="status"></tr>

            <tr><th><wicket:message key="gb.severity"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="severity"></select></td></tr>

            <tr wicket:id="priority"></tr>

         <tr wicket:id="responsible"></tr>

         <tr wicket:id="milestone"></tr>

         <tr wicket:id="mergeto"></tr>

@@ -71,5 +73,9 @@
   <th><wicket:message key="gb.mergeTo"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="mergeto"></select></td>

</wicket:fragment>



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

    <th><wicket:message key="gb.priority"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="priority"></select></td>

</wicket:fragment>



</wicket:extend>

</html>