diff options
author | Péter Dimitrov <[email protected]> | 2018-02-19 16:36:04 +0100 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2018-02-19 16:36:04 +0100 |
commit | 6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06 (patch) | |
tree | 00e710bef18144c88479215b603c7e10bbc7c6d6 /erts/obj | |
parent | 65c9c50714d45d8dba31f3e897862b6e2b389d60 (diff) | |
parent | 91dcab3cf054d43626164a626274f69280792c79 (diff) | |
download | otp-6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06.tar.gz otp-6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06.tar.bz2 otp-6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06.zip |
Merge branch 'maint'
* maint:
inets: Prepare for release
inets: Fix httpc crash on keep-alive connections
Change-Id: If066f788c3fcb8b5c5a943892d3c03c201590e40
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions