Merge branch 'master' into topic/genotype_download
commitbc9cefa0008acbe695d56235263b6e3d3f2cc9e6
authornickmorales <nmorales3142@gmail.com>
Mon, 9 Jan 2017 14:56:31 +0000 (9 09:56 -0500)
committernickmorales <nmorales3142@gmail.com>
Mon, 9 Jan 2017 14:56:31 +0000 (9 09:56 -0500)
tree3b44a71f5b63d03611f6c4577d977f76a81f6053
parent638c542da5c262403ce0a337a9d4a6bd23e59402
parent8767dd52ae0488fdebfe1fc96271ce210cdcd14e
Merge branch 'master' into topic/genotype_download
js/CXGN/BreederSearch.js
lib/SGN/Controller/AJAX/BrAPI.pm