diff options
| author | Péter Dimitrov <[email protected]> | 2019-03-08 14:56:18 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-03-08 14:56:18 +0100 |
| commit | 9377eeb3335a1552bd8a55a774da1608575ef039 (patch) | |
| tree | 77dcd093cbc3fc69e3dbdf106d8881d770b53e33 /.gitattributes | |
| parent | 7def10d22332fa0e0dd009ff4405b92a184ea3a5 (diff) | |
| parent | bf48c2a3d49f06ecd670ba6b298f5910055aa5aa (diff) | |
| download | otp-9377eeb3335a1552bd8a55a774da1608575ef039.tar.gz otp-9377eeb3335a1552bd8a55a774da1608575ef039.tar.bz2 otp-9377eeb3335a1552bd8a55a774da1608575ef039.zip | |
Merge branch 'peterdmv/inets/httpd_erl_script_timeout/ERIERL-321/OTP-15669' into maint
* peterdmv/inets/httpd_erl_script_timeout/ERIERL-321/OTP-15669:
inets: Fix handling of erl_script_timeout
Change-Id: I6a90408de48df6b8b01f44e0b273507bcec27b13
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions