From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 13 Aug 2020 06:15:06 +0000 (+0200)
Subject: Merge pull request #22205 from nextcloud/activity-settings-cleanup
X-Git-Tag: v20.0.0beta1~79
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3c5692244448bd095e6ad3df3859032c6fb62a8d;p=nextcloud-server.git

Merge pull request #22205 from nextcloud/activity-settings-cleanup

merge file activity settings into a single 'favorite changed' item
---

3c5692244448bd095e6ad3df3859032c6fb62a8d