Merge pull request #24932 from tspmelo/wip-nodejs-update

author Lenz Grimmer <lenz@grimmer.com>

Mon, 19 Nov 2018 12:16:28 +0000 (13:16 +0100)

committer GitHub <noreply@github.com>

Mon, 19 Nov 2018 12:16:28 +0000 (13:16 +0100)
author Lenz Grimmer <lenz@grimmer.com>
Mon, 19 Nov 2018 12:16:28 +0000 (13:16 +0100)
committer GitHub <noreply@github.com>
Mon, 19 Nov 2018 12:16:28 +0000 (13:16 +0100)
diff --cc src/pybind/mgr/dashboard/frontend/package-lock.json
Simple merge
diff --cc src/pybind/mgr/dashboard/frontend/package.json
Simple merge
author	Lenz Grimmer <lenz@grimmer.com>
	Mon, 19 Nov 2018 12:16:28 +0000 (13:16 +0100)
committer	GitHub <noreply@github.com>
	Mon, 19 Nov 2018 12:16:28 +0000 (13:16 +0100)
		1	2
src/pybind/mgr/dashboard/frontend/package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/frontend/package.json	patch \|	diff1 \|	diff2 \|	blob \| history