[Pkg-owncloud-commits] [owncloud] 40/86: Merge pull request #20489 from owncloud/backport-20487-8.1

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.1.5
in repository owncloud.

commit 7d8aaa81c0221c86d600c637943ffd48889ce6d9
Merge: e89ab22 cef8c87
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Dec 3 16:40:20 2015 +0100

    Merge pull request #20489 from owncloud/backport-20487-8.1
    
    [8.1] Activity oracle sql error for favorites

 apps/files/lib/activity.php       |  9 ++++++---
 apps/files/tests/activitytest.php | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git