[Pkg-owncloud-commits] [php-sabredav] 103/275: Merge branch 'master' into calendar-auto-schedule

[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 58f5bc8d71bb3d2876223d254ec43e98ff9b267d
Merge: a54c7b0 e031322
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jul 22 15:49:27 2014 -0400

    Merge branch 'master' into calendar-auto-schedule
    
    Conflicts:
    	examples/calendarserver.php

 ChangeLog.md                     | 7 +++++++
 examples/addressbookserver.php   | 1 +
 examples/calendarserver.php      | 2 ++
 examples/sql/pgsql.calendars.sql | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --cc examples/calendarserver.php
index 40efb2f,476aae1..de08a10
--- a/examples/calendarserver.php
+++ b/examples/calendarserver.php
@@@ -60,11 -60,8 +60,13 @@@ $server->addPlugin
      new Sabre\CalDAV\Subscriptions\Plugin()
  );
  
 +/* Calendar scheduling support */
 +$server->addPlugin(
 +    new Sabre\CalDAV\Schedule\Plugin()
 +);
 +
+ /* WebDAV-Sync plugin */
+ $server->addPlugin(new Sabre\DAV\Sync\Plugin());
  
  // Support for html frontend
  $browser = new Sabre\DAV\Browser\Plugin();

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