Merge branch 'master' of ssh://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab
Conflicts:
plugins/calendar/calendar.php
Merge branch 'master' of ssh://git.kolab.org/diffusion/RPK/roundcubemail… Tags None Referenced Files None Subscribers None
Description
Details
Event Timeline
Merged Changes |