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

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

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

@@ -88,6 +88,7 @@
   public boolean acceptNewPatchsets;

   public boolean acceptNewTickets;

   public boolean requireApproval;
   public String mergeTo;



   public transient boolean isCollectingGarbage;

   public Date lastGC;