Merge remote-tracking branch 'origin/master' into traywindow-listview-actions
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Wed, 20 May 2020 08:48:46 +0000 (10:48 +0200)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Wed, 20 May 2020 08:48:46 +0000 (10:48 +0200)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
1  2 
src/gui/owncloudgui.cpp
src/gui/systray.h
src/gui/tray/ActivityListModel.cpp
src/gui/tray/Window.qml

Simple merge
Simple merge
Simple merge
Simple merge