diff options
author | Siri Hansen <[email protected]> | 2018-04-19 11:48:33 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2018-04-19 11:48:33 +0200 |
commit | f15f615f9185077b02c011ac28257e8365c01e75 (patch) | |
tree | af56cdd0efe9d46783d3d85b28af6c0a7c89a2b2 /OTP_VERSION | |
parent | 19256441771c191bcc971377e438cfa859246c55 (diff) | |
parent | 6fad272f6b0a6b751386497191eb26e62e800ae2 (diff) | |
download | otp-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 'OTP_VERSION')
-rw-r--r-- | OTP_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION index 3eda57544c..bbcf7fc16a 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -20.3.2 +20.3.3 |