[Pkg-owncloud-commits] [php-sabredav] 05/19: Merge branch '3.0' into 3.1

[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 d2de187dc317e401d80800ed6ccf75cbd40bc953
Merge: 2ef494b 01a2f24
Author: Evert Pot <me at evertpot.com>
Date:   Tue Mar 15 16:03:07 2016 -0400

    Merge branch '3.0' into 3.1

 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc composer.json
index d4decb5,9994605..5e7d2b2
--- a/composer.json
+++ b/composer.json
@@@ -28,12 -28,12 +28,12 @@@
          "ext-ctype" : "*",
          "ext-date" : "*",
          "ext-iconv" : "*",
-         "ext-libxml" : ">=2.7.0"
+         "lib-libxml" : ">=2.7.0"
      },
      "require-dev" : {
 -        "phpunit/phpunit" : "~4.2",
 +        "phpunit/phpunit" : "> 4.8, <=6.0.0",
          "evert/phpdoc-md" : "~0.1.0",
 -        "sabre/cs"        : "~0.0.2"
 +        "sabre/cs"        : "~0.0.5"
      },
      "suggest" : {
          "ext-curl" : "*",

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