HomePhorge

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

Description

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

Conflicts:
program/lib/Roundcube/rcube_ldap.php

Event Timeline

Empty Commit

This commit is empty and does not affect any paths.