diff options
| author | Hans Nilsson <[email protected]> | 2014-11-28 14:43:28 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-11-28 14:43:28 +0100 |
| commit | 948c140f207fdae5016780229a8ad803aa80e372 (patch) | |
| tree | 54432fcee78dd6a2b38f6d62029dfa3485ce179b /lib/edoc/src/edoc_data.erl | |
| parent | fc2067dc316e66e07c351254fbfb4a7edbaf6be4 (diff) | |
| parent | 8124941f68eaec82ae372424979bf745db9ba9eb (diff) | |
| download | otp-948c140f207fdae5016780229a8ad803aa80e372.tar.gz otp-948c140f207fdae5016780229a8ad803aa80e372.tar.bz2 otp-948c140f207fdae5016780229a8ad803aa80e372.zip | |
Merge branch 'hans/eldap/timout_connect/OTP-12311' into maint
* hans/eldap/timout_connect/OTP-12311:
eldap: Fix timeout missing in ssl:connect
Diffstat (limited to 'lib/edoc/src/edoc_data.erl')
0 files changed, 0 insertions, 0 deletions