HomePhorge

Merge branch 'dev/sabre-vobject3' of ssh://git.kolab.org/git/roundcubemail…

Description

Merge branch 'dev/sabre-vobject3' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into dev/sabre-vobject3 after rebasing with master

Conflicts:
plugins/libcalendaring/libvcalendar.php
plugins/libcalendaring/tests/libvcalendar.php