Merge branch 'dev/sabredav2'
Conflicts:
composer.json
lib/Kolab/CalDAV/Plugin.php
lib/Kolab/CardDAV/ContactsBackend.php
lib/Kolab/Utils/DAVBackend.php
public_html/index.php
Resolves: T52
Merge branch 'dev/sabredav2'
Tags None Referenced Files None Subscribers None
Description Merge branch 'dev/sabredav2' Conflicts: Resolves: T52
Details
Event Timeline
Merged Changes |