Skip to content

Commit

Permalink
Merge branch 'master' of github.com:roundcube/roundcubemail
Browse files Browse the repository at this point in the history 
Conflicts:
	program/lib/Roundcube/rcube_ldap.php
  • Loading branch information
@alecpl
alecpl committed Jun 20, 2016
2 parents d08bd0a + bbbe607 commit ded320a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ded320a

Please sign in to comment.