[Pkg-owncloud-commits] [php-sabredav] 16/42: Merge pull request #555 from fruux/floating-times-reports

[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 e608d490163e25ea02e6914b259306fd21ffc240
Merge: f6be169 1e31c0a
Author: Evert Pot <me at evertpot.com>
Date:   Fri Nov 14 11:34:31 2014 -0500

    Merge pull request #555 from fruux/floating-times-reports
    
    Floating times reports

 ChangeLog.md                                       |   6 +-
 composer.json                                      |   2 +-
 lib/CalDAV/Plugin.php                              | 100 +++++++++---
 lib/CalDAV/Schedule/Plugin.php                     |  14 +-
 .../Sabre/CalDAV/ExpandEventsFloatingTimeTest.php  | 170 +++++++++++++++++++++
 tests/Sabre/CalDAV/FreeBusyReportTest.php          |  29 +++-
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  |   3 +-
 7 files changed, 295 insertions(+), 29 deletions(-)

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