Merge pull request #36771 from rhcs-dashboard/wip-47118-master

author Lenz Grimmer <lgrimmer@suse.com>

Wed, 30 Sep 2020 15:06:06 +0000 (17:06 +0200)

committer GitHub <noreply@github.com>

Wed, 30 Sep 2020 15:06:06 +0000 (17:06 +0200)
author Lenz Grimmer <lgrimmer@suse.com>
Wed, 30 Sep 2020 15:06:06 +0000 (17:06 +0200)
committer GitHub <noreply@github.com>
Wed, 30 Sep 2020 15:06:06 +0000 (17:06 +0200)
diff --cc src/pybind/mgr/dashboard/frontend/cypress.json
Simple merge
diff --cc src/pybind/mgr/dashboard/frontend/package.json
Simple merge
author	Lenz Grimmer <lgrimmer@suse.com>
	Wed, 30 Sep 2020 15:06:06 +0000 (17:06 +0200)
committer	GitHub <noreply@github.com>
	Wed, 30 Sep 2020 15:06:06 +0000 (17:06 +0200)
		1	2
src/pybind/mgr/dashboard/frontend/cypress.json	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/frontend/package.json	patch \|	diff1 \|	diff2 \|	blob \| history