Merge branch 'master' into CLIMATE-943 488/head
authorMichaelArthurAnderson <michael.arthur.anderson@gmail.com>
Wed, 17 Jan 2018 02:50:17 +0000 (21:50 -0500)
committerGitHub <noreply@github.com>
Wed, 17 Jan 2018 02:50:17 +0000 (21:50 -0500)
commit50b9d984f1e5264fa3fb98a7366f2a0ff37a6560
tree6fbe0992bf4ab0d5839e3ccc62b7d38d0d7dffd7
parentfa2098fc116062261c96b643112be2fb79f00eeb
parent1373563d239b88d425fc89adf9192539a4e9533d
Merge branch 'master' into CLIMATE-943
ocw-ui/frontend/app/scripts/controllers/parameterselect.js