Merge branch 'CLIMATE-413' of https://github.com/MichaelArthurAnderson/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/59dbe805 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/59dbe805 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/59dbe805 Branch: refs/heads/master Commit: 59dbe805b9dfd148eab29deadb292d652894f9f1 Parents: 69bbe27 5a632c8 Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Tue Jan 16 18:01:49 2018 -0800 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Tue Jan 16 18:01:49 2018 -0800 ---------------------------------------------------------------------- ocw-ui/frontend/package.json | 22 +++++++++++------ ocw-ui/frontend/test/karma.conf.js | 43 ++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
