leinir updated this revision to Diff 77494. leinir added a comment.
- Merge branch 'master' into fix-update - Update @since REPOSITORY R304 KNewStuff CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D27544?vs=76096&id=77494 BRANCH fix-update (branched from master) REVISION DETAIL https://phabricator.kde.org/D27544 AFFECTED FILES src/core/engine.cpp src/core/jobs/httpworker.cpp src/core/security.cpp src/qtquick/qml/EntryDetails.qml src/qtquick/qml/NewStuffItem.qml src/qtquick/qml/private/entrygriddelegates/BigPreviewDelegate.qml src/qtquick/qml/private/entrygriddelegates/ThumbDelegate.qml src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml src/qtquick/quickitemsmodel.cpp src/qtquick/quickitemsmodel.h To: leinir, #knewstuff, #frameworks, #plasma, ngraham, apol, #discover_software_store Cc: alexde, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
