aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-05-08 10:09:17 +0200
committerRickard Green <[email protected]>2019-05-08 10:09:17 +0200
commita85ee28f2b72a72da63ada2561e2dd53afdbf6d9 (patch)
tree2b52861c132fc4c2c5f30b2e80533b3df0a14fd2 /lib/ssl/vsn.mk
parent79df59b5e0643a236fdc238e7417053f84e50c77 (diff)
parentc9fdce99cd311eb07a6cbac2c25186f7609b565c (diff)
downloadotp-a85ee28f2b72a72da63ada2561e2dd53afdbf6d9.tar.gz
otp-a85ee28f2b72a72da63ada2561e2dd53afdbf6d9.tar.bz2
otp-a85ee28f2b72a72da63ada2561e2dd53afdbf6d9.zip
Merge branch 'maint'
* maint: Fix bad merge from maint-21 Fix bad merge from maint-21 Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
Diffstat (limited to '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 98070f794c..b5545b71f7 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.2.2
+SSL_VSN = 9.2.3