Merge branch 'topic/related_stock_datatables' into topic/trials_from_seedlots
commit73892f9972efd52c505182a9d2b7e44ba053037f
authornickmorales <nmorales3142@gmail.com>
Thu, 14 Sep 2017 19:16:56 +0000 (14 15:16 -0400)
committernickmorales <nmorales3142@gmail.com>
Thu, 14 Sep 2017 19:16:56 +0000 (14 15:16 -0400)
tree1a93a06bb7833bd041db42a2cdfd31ccff8f5cfd
parent754c856c3bb7f92372d7816c53f57e3dc049f852
parent063f81595fa99cdda385aa6bc286b19b8a96720e
Merge branch 'topic/related_stock_datatables' into topic/trials_from_seedlots
lib/CXGN/Trial/TrialDesign.pm
lib/SGN/Controller/AJAX/Stock.pm