Commit df109896 authored by Aaron Petkau's avatar Aaron Petkau

Merge branch 'json-ignore-sistr-setting' into 'development'

ignoring the sistr setting for sync

See merge request !1295
parents b66c79a3 7277d94a
Pipeline #6727 passed with stage
in 56 minutes and 28 seconds
......@@ -24,6 +24,7 @@ import javax.persistence.TemporalType;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.hibernate.envers.Audited;
import org.hibernate.envers.NotAudited;
......@@ -288,10 +289,12 @@ public class Project extends IridaResourceSupport
this.maximumCoverage = maximumCoverage;
public AutomatedSISTRSetting getSistrTypingUploads() {
return sistrTypingUploads;
public void setSistrTypingUploads(AutomatedSISTRSetting sistrTypingUploads) {
this.sistrTypingUploads = sistrTypingUploads;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment