Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/utils/JsonUtils.java

@@ -274,10 +274,10 @@
      return builder.create();

   }



   private static class GmtDateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {

   public static class GmtDateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {

      private final DateFormat dateFormat;



      private GmtDateTypeAdapter() {

      public GmtDateTypeAdapter() {

         dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);

         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));

      }