[Pkg-owncloud-commits] [php-sabredav] 127/220: Merge branch 'master' into psr-3-support

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 20f8381bb8ca45627762c579aa106e3d5621e780
Merge: 99f8249 1af6a48
Author: Evert Pot <me at evertpot.com>
Date:   Fri Apr 1 17:43:54 2016 -0400

    Merge branch 'master' into psr-3-support

 .travis.yml                         |  6 ++++--
 CHANGELOG.md                        |  1 +
 lib/DAV/Server.php                  | 17 ++++++++++++++---
 tests/Sabre/DAV/ServerMKCOLTest.php | 34 +++++++++++++++++++++++++++-------
 4 files changed, 46 insertions(+), 12 deletions(-)


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