Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/models/ServerSettings.java

@@ -58,4 +58,8 @@
   public boolean hasKey(String key) {

      return settings.containsKey(key);

   }



   public SettingModel remove(String key) {

      return settings.remove(key);

   }

}