[Pkg-owncloud-commits] [php-sabredav] 30/40: Merge branch '3.0'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 3.1.0-alpha2
in repository php-sabredav.

commit 0bf5b7ee36c370ed4ccdea79ea80eff624217f90
Merge: c890cec 704ae12
Author: Evert Pot <me at evertpot.com>
Date:   Fri Aug 28 22:50:30 2015 +0200

    Merge branch '3.0'
    
    Conflicts:
    	tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php

 CHANGELOG.md                                                       | 2 ++
 lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php          | 7 ++++++-
 .../CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php      | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)


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