Thomas Bruederli d99b8f8fee 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		2015-04-02 16:12:42 +02:00
..
resources	Fix TRIGGER properties with absilute date-time values (#3881)	2015-04-02 16:09:09 +02:00
libcalendaring.php	Fix typo in function name (parse_alarm_value)	2015-01-22 12:17:33 -05:00
libvcalendar.php	Merge branch 'dev/sabre-vobject3' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into dev/sabre-vobject3	2015-04-02 16:12:42 +02:00