Resolve merge conflict for #61#65

marmarek wants to merge 9 commits into

QubesOS:masterQubesOS/qubes-desktop-linux-menu:masterfrom

marmarek:pr-61marmarek/qubes-desktop-linux-menu:pr-61Copy head branch name to clipboard