Merge branch 'master' into topic/plant_layout_download_order
commitb8cb9abbe734bdfa3d87ecfd870d7ac918e34367
authorNick Morales <nickmorales@users.noreply.github.com>
Mon, 27 Aug 2018 13:02:03 +0000 (27 16:02 +0300)
committerGitHub <noreply@github.com>
Mon, 27 Aug 2018 13:02:03 +0000 (27 16:02 +0300)
treebcb78d5c6823cc60be94134d1f9e79628f60c1e7
parentd4b267a4189ab2a322da1da91af745d23ba74c62
parent554e183c9b4302214fc4d9dbf44610d841a080f4
Merge branch 'master' into topic/plant_layout_download_order
lib/CXGN/Trial.pm
lib/CXGN/Trial/TrialLayout.pm