aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-09 10:29:12 +0200
committerIngela Anderton Andin <[email protected]>2016-05-09 10:29:12 +0200
commit67d4141ae1b58e9a63f5eb84f3f01883bd495b64 (patch)
treea55c68b019f7bfed1c28aa0cef389c89f02d5687
parent4de491e9c563c49b5d5c88756c5ba00eb0dff66c (diff)
parentec7016043e8114a332780b808cb82f5902fe5387 (diff)
downloadotp-67d4141ae1b58e9a63f5eb84f3f01883bd495b64.tar.gz
otp-67d4141ae1b58e9a63f5eb84f3f01883bd495b64.tar.bz2
otp-67d4141ae1b58e9a63f5eb84f3f01883bd495b64.zip
Merge branch 'ingela/ssl/prepare-for-release'
* ingela/ssl/prepare-for-release: ssl: Prepare for release Conflicts: lib/ssl/vsn.mk
-rw-r--r--lib/ssl/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 8f4f384497..3b51fa8c6b 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 7.3.2
+SSL_VSN = 8.0