Merge branch 'master' of github.com:roundcube/roundcubemail
5352b55779aa
Actions

Description

Merge branch 'master' of github.com:roundcube/roundcubemail

Conflicts:
CHANGELOG

Details

Provenance

Parents

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

Changes (9)

Path

Size

program/

include/

lib/

Roundcube/

steps/

addressbook/

mail/

settings/

R3:5352b55779aa

CHANGELOG

program/include/rcmail.php

program/lib/Roundcube/rcube_imap.php

program/lib/Roundcube/rcube_vcard.php

program/steps/addressbook/edit.inc

program/steps/addressbook/func.inc

program/steps/addressbook/import.inc

program/steps/mail/compose.inc

program/steps/settings/func.inc

Merge branch 'master' of github.com:roundcube/roundcubemail5352b55779aaActions