ngraham updated this revision to Diff 49408. ngraham added a comment.
Rebase on master and fix merge conflicts REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D16031?vs=46523&id=49408 BRANCH arcpatch-D16031 REVISION DETAIL https://phabricator.kde.org/D16031 AFFECTED FILES lookandfeel/contents/components/ActionButton.qml sddm-theme/Main.qml To: ngraham, #vdg, #plasma, rizzitello, davidedmundson Cc: alexde, raddison, romangg, davidedmundson, rizzitello, abetts, pstefan, broulik, rikmills, filipf, rooty, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, sebas, apol, mart
