Merge pull request #26410 from tspmelo/wip-bootstrap-3.4.1

author Lenz Grimmer <lenz@grimmer.com>

Thu, 14 Feb 2019 10:07:18 +0000 (11:07 +0100)

committer GitHub <noreply@github.com>

Thu, 14 Feb 2019 10:07:18 +0000 (11:07 +0100)
author Lenz Grimmer <lenz@grimmer.com>
Thu, 14 Feb 2019 10:07:18 +0000 (11:07 +0100)
committer GitHub <noreply@github.com>
Thu, 14 Feb 2019 10:07:18 +0000 (11:07 +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>
	Thu, 14 Feb 2019 10:07:18 +0000 (11:07 +0100)
committer	GitHub <noreply@github.com>
	Thu, 14 Feb 2019 10:07:18 +0000 (11:07 +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