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)
commite9a82dff7798d2cb15dcf13680c4c39783ed480b
tree78809ac610584014298400600ff291efe764380b
parent9bfcdbae3a8ad5925217fd367b0a622cd9aaf180
parent7c5dbdd0045738601c85a7e245643425af2c83b4
Merge remote-tracking branch 'origin/master' into traywindow-listview-actions

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