[Pkg-owncloud-commits] [php-sabre-vobject] 07/29: Merge pull request #273 from fruux/max-instances-to-settings

[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-sabre-vobject.

commit b2f169deb0468d81b6c25266658661e9ac5f969c
Merge: 32a7b92 dd2370b
Author: Evert Pot <me at evertpot.com>
Date:   Wed Dec 2 15:39:19 2015 -0500

    Merge pull request #273 from fruux/max-instances-to-settings
    
    Moved $maxInstances to Settings::$maxRecurrences.

 CHANGELOG.md                                         |  3 +++
 lib/FreeBusyGenerator.php                            |  2 +-
 lib/Recur/EventIterator.php                          | 20 +++-----------------
 lib/Settings.php                                     | 17 +++++++++++++++++
 .../VObject/Recur/EventIterator/MaxInstancesTest.php |  8 ++++----
 5 files changed, 28 insertions(+), 22 deletions(-)

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