tree 43736777ab8f256698f65ad667d33c9d660f33a7
parent 61fd4028bc69bd4b96b16e061e590af16d9f14ae
parent 1ccd61cb26c1ae28891eb42ad128cd7d0a4bc5b6
author Rohit Yadav <rohit.yadav@shapeblue.com> 1627637409 +0530
committer Rohit Yadav <rohit.yadav@shapeblue.com> 1627637409 +0530

Merge remote-tracking branch 'origin/4.15' into main

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

 Conflicts:
	ui/src/utils/plugins.js
	ui/src/views/AutogenView.vue
	ui/tests/mockData/ActionButton.mock.json
	ui/tests/unit/views/compute/MigrateWizard.spec.js