[Pkg-owncloud-commits] [php-sabredav] 56/75: Merge branch '2.0' into 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 9754cb36c02a7ffec3220f9a1dc06d87c8cd3490
Merge: ff814c3 51451a0
Author: Evert Pot <me at evertpot.com>
Date:   Mon Feb 23 16:19:17 2015 -0500

    Merge branch '2.0' into 2.1
    
    Conflicts:
    	composer.json

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

diff --cc composer.json
index 5fe1839,eac95c3..80d8dd4
--- a/composer.json
+++ b/composer.json
@@@ -15,9 -15,9 +15,9 @@@
      ],
      "require": {
          "php": ">=5.4.1",
-         "sabre/vobject": "~3.3.4",
 -        "sabre/vobject" : "~3.3",
 -        "sabre/event" : "~1.0.0",
 -        "sabre/http" : "~2.0.2",
++        "sabre/vobject": "~3.3",
 +        "sabre/event" : "~2.0.0",
 +        "sabre/http" : "~3.0.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