[Pkg-owncloud-commits] [owncloud] 368/457: Merge pull request #16869 from owncloud/php7

[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 672b8752e4491f9a2749d133dad49da66be2d2dd
Merge: 88d3c9a 3090348
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu Jun 11 09:29:49 2015 +0200

    Merge pull request #16869 from owncloud/php7
    
    Null -> NullCache

 lib/private/memcache/factory.php                 | 4 ++--
 lib/private/memcache/{null.php => nullcache.php} | 2 +-
 lib/private/server.php                           | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

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