diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-02-12 10:46:34 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-02-12 10:46:34 +0100 |
| commit | c9db88aa3bbea2e65976b50b584f10b792a5d550 (patch) | |
| tree | 72b68b7d3a6e89b90f15cf07ddbdac0aa21e22e5 /apps | |
| parent | 73038156cc9f8feb4838d8a7d9f610140c496cb9 (diff) | |
| parent | 95e7be4aecab464eca0d4a645c90febc3f064e61 (diff) | |
| download | nextcloud-server-c9db88aa3bbea2e65976b50b584f10b792a5d550.tar.gz nextcloud-server-c9db88aa3bbea2e65976b50b584f10b792a5d550.zip | |
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/calendar/caldav.php | 2 | ||||
| -rw-r--r-- | apps/contacts/carddav.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php index b581274398d..db0b35da118 100644 --- a/apps/calendar/caldav.php +++ b/apps/calendar/caldav.php @@ -19,7 +19,7 @@ $caldavBackend = new OC_Connector_Sabre_CalDAV(); // Root nodes $nodes = array( - new Sabre_DAVACL_PrincipalCollection($principalBackend), + new Sabre_CalDAV_Principal_Collection($principalBackend), new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend), ); diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php index df7c858b1a0..a2bf492e206 100644 --- a/apps/contacts/carddav.php +++ b/apps/contacts/carddav.php @@ -33,7 +33,7 @@ $carddavBackend = new OC_Connector_Sabre_CardDAV(); // Root nodes $nodes = array( - new Sabre_DAVACL_PrincipalCollection($principalBackend), + new Sabre_CalDAV_Principal_Collection($principalBackend), new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend), ); |