Merged #33 "Merge overrides in addition to merging the normal settings"

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

 src/main/java/com/gitblit/wicket/pages/DocPage.java

@@ -67,6 +67,10 @@
         }

      }



      if (markupText == null) {

         markupText = "";

      }



      BugtraqProcessor bugtraq = new BugtraqProcessor(app().settings());

      markupText = bugtraq.processText(getRepository(), repositoryName, markupText);