Commit graph

2 commits

Author SHA1 Message Date
casper
8708fd0f3a Merge remote-tracking branch 'origin/CURA-8587_disable_update_install_and_uninstall' into CURA-8587_disable_update_install_and_uninstall
# Conflicts:
#	plugins/Marketplace/resources/qml/PackageCard.qml
#	plugins/Marketplace/resources/qml/PackagePage.qml
2021-12-08 20:01:55 +01:00
casper
d405652db7 Combine dublicated elements from PackageCard and PackagePage into
reusable component `PackageCardHeader`

cura 8734
2021-12-08 19:41:50 +01:00