Display action button for conflict files in activity
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Mon, 5 Dec 2022 12:54:11 +0000 (13:54 +0100)
committerMatthieu Gallien <matthieu.gallien@nextcloud.com>
Wed, 25 Jan 2023 15:37:35 +0000 (16:37 +0100)
commit5908ac41766a6df44d23121117d10ab9e05f768c
tree66140465a07812ca8a5ee992a5759857fff8a966
parent602b8db5e2adc287b2a0ecb3d409e4811d079f78
Display action button for conflict files in activity

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/gui/tray/ActivityItem.qml
src/gui/tray/activitylistmodel.cpp
src/gui/tray/activitylistmodel.h
src/gui/tray/usermodel.cpp