Merge branch 'master' into resource-cleanup
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 19 Jan 2020 19:44:50 +0000 (20:44 +0100)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 19 Jan 2020 19:44:59 +0000 (20:44 +0100)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
1  2 
src/gui/tray/ActivityListModel.cpp

Simple merge