aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-06-05 14:05:38 +0200
committerJohn Högberg <[email protected]>2018-06-05 14:05:38 +0200
commit5cb944bf32b7b3f4ec5500710fe10c28a643e1fd (patch)
tree817ed501c02aeda7cdc03725a6d4325a7f5741b0 /OTP_VERSION
parentbbb3d151e6329d58b34e526fefb6964677d93104 (diff)
parentcfaede58328ace4bb4fb7c5e1b055e420c0ded9a (diff)
downloadotp-5cb944bf32b7b3f4ec5500710fe10c28a643e1fd.tar.gz
otp-5cb944bf32b7b3f4ec5500710fe10c28a643e1fd.tar.bz2
otp-5cb944bf32b7b3f4ec5500710fe10c28a643e1fd.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release inets: Gracefully handle bad headers [erl_docgen] Update version [erl_docgen] Add missing file db_funcs.xsl to file list erts: Fix bug in system_profile erts: Fix bug in enif_binary_to_term for immediates
Diffstat (limited to 'OTP_VERSION')
-rw-r--r--OTP_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index aae1179bab..264e3d1a33 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-20.3.6
+20.3.7