Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -18,6 +18,7 @@
               <select wicket:id="fromRef" class="span3" />

               <i class="icon-arrow-right"></i>

               <select wicket:id="toRef" class="span3" />

                      <label style="padding:0px 5px;" class="checkbox"><input type="checkbox" wicket:id="ignoreWhitespaceCheckbox" /> <span wicket:id="ignoreWhitespaceLabel"></span></label>

               <button class="btn" type="submit"><wicket:message key="gb.compare"></wicket:message></button>

            </form>

         </div>

@@ -26,6 +27,7 @@
               <input wicket:id="fromId" type="text" class="span3" />

               <i class="icon-arrow-right"></i>

               <input wicket:id="toId" type="text" class="span3" />

                    <label style="padding:0px 5px;" class="checkbox"><input type="checkbox" wicket:id="ignoreWhitespaceCheckbox" /> <span wicket:id="ignoreWhitespaceLabel"></span></label>

               <button class="btn" type="submit"><wicket:message key="gb.compare"></wicket:message></button>

            </form>

         </div>