Ghostkeeper d6143103d0 Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details ... Conflicts: plugins/Marketplace/resources/qml/Marketplace.qml -> Whole layout changed, while the onboarding banner got added. I re-added the onboarding banner item and the new search link at locations where I thought it was appropriate. plugins/Marketplace/resources/qml/Packages.qml -> A small conflict where new properties got added while I moved the width property up a bit for consistency. Easy enough to fix.		2021-11-30 16:16:20 +01:00
..
images	Add placeholder image	2021-11-09 15:51:34 +01:00
qml	Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details	2021-11-30 16:16:20 +01:00