Merge branch 'dev/kolab3'
Conflicts:
plugins/calendar/drivers/kolab/kolab_driver.php
Merge branch 'dev/kolab3'
Tags None Referenced Files None Subscribers None
Description Merge branch 'dev/kolab3' Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
|