Commit 242cc2e

Jerry Cheung

committed

Merge remote-tracking branch 'ruby-ldap/master' into search-timeout

Conflicts: lib/net/ldap.rb

2 parents 3c2c5e6 + 7055879 commit 242cc2eCopy full SHA for 242cc2e

5 files changed

+602

-580

lines changed

+602

-580

lines changed

Comments

(0)