[Pkg-owncloud-commits] [php-sabre-vobject] 02/10: Merge pull request #310 from fruux/fix-306-b

[David Prévot]

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

taffit pushed a commit to branch 3
in repository php-sabre-vobject.

commit ee2c03311ba3fd2c641dc6dca79aae24a26f9e33
Merge: 061dd47 3919e59
Author: Evert Pot <me at evertpot.com>
Date:   Tue Mar 29 21:14:34 2016 -0400

    Merge pull request #310 from fruux/fix-306-b
    
    Add `RECURRENCE-ID` to the first event in the series.

 ChangeLog.md                                                |  9 ++++++++-
 lib/Recur/EventIterator.php                                 | 13 +++----------
 lib/Version.php                                             |  2 +-
 tests/VObject/Component/VCalendarTest.php                   |  1 +
 .../VObject/Recur/EventIterator/ExpandFloatingTimesTest.php |  7 +++++--
 tests/VObject/Recur/EventIterator/IncorrectExpandTest.php   |  6 ++++--
 tests/VObject/Recur/EventIterator/MissingOverriddenTest.php |  6 ++++--
 7 files changed, 26 insertions(+), 18 deletions(-)

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