diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-04 14:19:00 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-04 14:19:00 +0200 |
| commit | c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0 (patch) | |
| tree | 1b41ff540a0d3144c6ba5c57caf16af55b685cfc /program/lib/Roundcube/rcube_ldap.php | |
| parent | e6b6925b6763157a3db62ab84c3efaa9e54f9dcc (diff) | |
Fix conflicts in last commit
Diffstat (limited to 'program/lib/Roundcube/rcube_ldap.php')
0 files changed, 0 insertions, 0 deletions