Merge branch 'master' into feature/RM-4921_ExceptionsDoneOnTransactionCommit

This commit is contained in:
Ramona Popa
2017-05-12 17:08:52 +03:00
11 changed files with 131 additions and 31 deletions

View File

@@ -134,7 +134,7 @@ public class RecordCategoryChildProperties extends TestModel
private Boolean recordSearchDispositionEventsEligible;
@JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
private String recordSearchDispositionInstructions;
private String recordSearchDispositionInstructions;
@JsonProperty (PROPERTIES_OWNER)
private Owner owner;