merge master
commita3f25efc64ce306ed88459acf39378fa6ee5d556
authornickmorales <nmorales3142@gmail.com>
Mon, 17 Apr 2017 18:18:13 +0000 (17 14:18 -0400)
committernickmorales <nmorales3142@gmail.com>
Mon, 17 Apr 2017 18:18:13 +0000 (17 14:18 -0400)
tree3fbd0d2d08f0a58dd3c5ea9e1d85e95835cdbd00
parent2b6d17787253dfadebecbab4fce05e184cea82b1
parent2309659d1c3d70102895d4d5307718920182ca86
merge master
lib/CXGN/BrAPI/v1/Studies.pm
lib/SGN/Controller/AJAX/BrAPI.pm