[Pkg-owncloud-commits] [php-sabredav] 57/75: 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 95e3d2994d1b0c8d4bd084a6ec98e90d3a5469c4
Merge: cee9933 9754cb3
Author: Evert Pot <me at evertpot.com>
Date:   Wed Feb 25 12:46:33 2015 -0500

    Merge branch '2.1'

 CHANGELOG.md  | 7 +++++++
 composer.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc composer.json
index 821d73a,80d8dd4..3fc13ad
--- a/composer.json
+++ b/composer.json
@@@ -15,10 -15,9 +15,10 @@@
      ],
      "require": {
          "php": ">=5.4.1",
-         "sabre/vobject": "~3.3.4",
+         "sabre/vobject": "~3.3",
          "sabre/event" : "~2.0.0",
 -        "sabre/http" : "~3.0.0",
 +        "sabre/http" : "dev-master",
 +        "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