[Pkg-owncloud-commits] [php-sabredav] 54/148: Merge branch '2.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 51b1f52390400882686bea1ab1902c443d60489b
Merge: 6f7519e 71b7688
Author: Evert Pot <me at evertpot.com>
Date:   Thu Feb 26 11:37:27 2015 -0500

    Merge branch '2.1'
    
    Conflicts:
    	CHANGELOG.md

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

diff --cc composer.json
index 7eb19d5,e11e31b..4573dfb
--- a/composer.json
+++ b/composer.json
@@@ -15,10 -15,9 +15,10 @@@
      ],
      "require": {
          "php": ">=5.4.1",
-         "sabre/vobject": "~3.3",
+         "sabre/vobject": ">=3.3.4 <4",
          "sabre/event" : "~2.0.0",
 -        "sabre/http" : "~3.0.0",
 +        "sabre/http" : "4.0.0-alpha1",
 +        "sabre/uri" : "~1.0",
          "ext-dom": "*",
          "ext-pcre": "*",
          "ext-spl": "*",

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