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)
commitbb757c6a27a5c2683bc9d0a341e5fc795ef83877
tree7cdc6c8e49eff1153787799e8354cc7e62eeeee9
parentf99fc722ac420e0ad70691771cb45a19f0184573
parent03cddabfd026af3af0006bd73bb7733c8b7b73f3
Merge branch 'master' into resource-cleanup

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
src/gui/tray/ActivityListModel.cpp