Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html

@@ -39,6 +39,7 @@
            <span wicket:id="repositoryLinks"></span>

            <div>

               <img class="inlineIcon" wicket:id="sparkleshareIcon" />

               <img class="inlineIcon" wicket:id="mirrorIcon" />

               <img class="inlineIcon" wicket:id="frozenIcon" />

               <img class="inlineIcon" wicket:id="federatedIcon" />