Merge branch 'master' into topic/design_type
commitd8e551f537fba0ea90a0528bd1e9cb0f5c9a3a30
authortitima15 <tt15@cornell.edu>
Mon, 20 Jul 2020 15:04:42 +0000 (20 15:04 +0000)
committertitima15 <tt15@cornell.edu>
Mon, 20 Jul 2020 15:04:42 +0000 (20 15:04 +0000)
treeaec5422f11a18aee9cb4ae004b36dbd34eecf7b5
parent26e133007cbf1d36ea2bccc92bc236d180a70fd3
parent856964e03931c8d18b1d9618772280647817fbb8
Merge branch 'master' into topic/design_type
mason/breeders_toolbox/trial/trial_create_dialogs.mas