Merge non-fast-forward for release branch merges

James Moger

2014-06-16 9186c6413e7cdfc33527ca69d2e56dfec6d8b760

 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);

   }

}