ngraham updated this revision to Diff 25692. ngraham added a comment.
Merge master and fix the issue of "installed:" getting appended to the origin string REPOSITORY R134 Discover Software Store CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D9976?vs=25640&id=25692 BRANCH actually-use-combobox-to-choose-source REVISION DETAIL https://phabricator.kde.org/D9976 AFFECTED FILES discover/qml/ApplicationPage.qml libdiscover/backends/FlatpakBackend/FlatpakResource.cpp libdiscover/backends/FlatpakBackend/FlatpakResource.h libdiscover/backends/KNSBackend/KNSResource.cpp libdiscover/backends/KNSBackend/KNSResource.h libdiscover/backends/PackageKitBackend/LocalFilePKResource.h libdiscover/backends/PackageKitBackend/PackageKitResource.cpp libdiscover/backends/PackageKitBackend/PackageKitResource.h libdiscover/backends/SnapBackend/SnapResource.cpp libdiscover/backends/SnapBackend/SnapResource.h libdiscover/resources/AbstractResource.cpp libdiscover/resources/AbstractResource.h To: ngraham, apol, colomar, abetts, #discover_software_store, #vdg, andreaska Cc: plasma-devel, romangg, ZrenBot, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
