aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-04-19 11:48:33 +0200
committerSiri Hansen <[email protected]>2018-04-19 11:48:33 +0200
commitf15f615f9185077b02c011ac28257e8365c01e75 (patch)
treeaf56cdd0efe9d46783d3d85b28af6c0a7c89a2b2 /erts
parent19256441771c191bcc971377e438cfa859246c55 (diff)
parent6fad272f6b0a6b751386497191eb26e62e800ae2 (diff)
downloadotp-f15f615f9185077b02c011ac28257e8365c01e75.tar.gz
otp-f15f615f9185077b02c011ac28257e8365c01e75.tar.bz2
otp-f15f615f9185077b02c011ac28257e8365c01e75.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release Update appup file for sasl Fix bug in hybrid boot file used for restart_new_emulator
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions