Merge commit 'refs/pull/596/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/87f53a96 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/87f53a96 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/87f53a96 Branch: refs/heads/master Commit: 87f53a96ff14d4ab6bb394b5e9150991e98bf6c0 Parents: 6af6f17 4fd27f1 Author: Michael Russo <[email protected]> Authored: Sat Dec 29 11:10:00 2018 -0800 Committer: Michael Russo <[email protected]> Committed: Sat Dec 29 11:10:00 2018 -0800 ---------------------------------------------------------------------- portal/Gruntfile.js | 2 +- portal/package.json | 51 +++++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
