From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 28 Nov 2014 16:35:05 +0000 (+0100)
Subject: Merge pull request #12488 from owncloud/activity_group_multiple_conditions
X-Git-Tag: v8.0.0alpha1~209
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f;p=nextcloud-server.git

Merge pull request #12488 from owncloud/activity_group_multiple_conditions

activitymanager: concatenate queries with 'or'
---

f0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f