[Pkg-owncloud-commits] [php-sabredav] 14/148: Merge branch 'master' into xml-rewrite2

[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 2bf8b0f09be011790987459f6755402aa85aefd6
Merge: f542076 c36a40a
Author: Evert Pot <me at evertpot.com>
Date:   Thu Feb 5 18:37:32 2015 -0500

    Merge branch 'master' into xml-rewrite2
    
    Conflicts:
    	composer.json

 ChangeLog.md                                       |  1 +
 README.md                                          |  4 +--
 composer.json                                      |  5 +--
 lib/CalDAV/ICSExportPlugin.php                     | 19 +++++++++-
 lib/DAV/Server.php                                 | 12 ++++---
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  | 40 ++++++++++++++++++++++
 tests/Sabre/DAV/ServerSimpleTest.php               | 18 ----------
 tests/Sabre/DAVServerTest.php                      |  5 +++
 8 files changed, 76 insertions(+), 28 deletions(-)

diff --cc composer.json
index afcf1de,821d73a..e52a9f1
--- a/composer.json
+++ b/composer.json
@@@ -17,8 -17,8 +17,9 @@@
          "php": ">=5.4.1",
          "sabre/vobject": "~3.3.4",
          "sabre/event" : "~2.0.0",
-         "sabre/http" : "~3.0.4",
-         "sabre/xml"  : "~0.2.1",
++        "sabre/xml"  : "~0.2.2",
+         "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