Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/client/IndicatorsRenderer.java

@@ -98,11 +98,6 @@
            tooltip.append(Translation.get("gb.isFork")).append("<br/>");

            add(icon);

         }

         if (model.useDocs) {

            JLabel icon = new JLabel(doxIcon);

            tooltip.append(Translation.get("gb.docs")).append("<br/>");

            add(icon);

         }

         if (model.isFrozen) {

            JLabel icon = new JLabel(frozenIcon);

            tooltip.append(Translation.get("gb.isFrozen")).append("<br/>");