[Pkg-owncloud-commits] [php-sabredav] 42/80: Merge pull request #743 from fruux/vobject4

[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 cfeb30d3c8ebb03b12f9b42b427895e02a18d079
Merge: 3e1f381 0ccf55c
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 4 14:32:24 2016 -0500

    Merge pull request #743 from fruux/vobject4
    
    Requiring vobject 4. Fixing expand() issues.

 CHANGELOG.md                                        | 1 +
 composer.json                                       | 2 +-
 lib/CalDAV/ICSExportPlugin.php                      | 2 +-
 lib/CalDAV/Plugin.php                               | 6 +++---
 tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php | 8 ++++----
 tests/Sabre/CalDAV/PluginTest.php                   | 8 ++++----
 6 files changed, 14 insertions(+), 13 deletions(-)

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