Homec4science

Merge branch 'dev' into staging

Authored by borel on Jul 19 2021, 17:00.

Description

Merge branch 'dev' into staging

Merged Changes

CommitAuthorDetailsCommitted
a86a1b3f049cborel
roll back Term display string due to JSON upload error 
Jul 19 2021
df0074733ef8borel
explicit sort order for ConditionSets and Terms 
Jul 16 2021
b04f5570c409borel
quick clean-up 
Jul 16 2021