Merge branch 'master' into traywindow-listview-actions
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Fri, 29 May 2020 17:08:21 +0000 (19:08 +0200)
committerGitHub <noreply@github.com>
Fri, 29 May 2020 17:08:21 +0000 (19:08 +0200)
1  2 
src/gui/systray.h

Simple merge