[Pkg-owncloud-commits] [owncloud] 27/107: Merge pull request #20488 from owncloud/backport-20487-8.2

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 152952be68b7c9ee1b929b52b762b6d4963b5a8a
Merge: 741392b 61dbfb9
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Dec 1 09:38:01 2015 +0100

    Merge pull request #20488 from owncloud/backport-20487-8.2
    
    [8.2] 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