aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-12-15 12:31:35 +0100
committerHans Nilsson <[email protected]>2017-12-15 12:31:35 +0100
commitffc5d16de3350e754a4d4da2be42d29b821233e1 (patch)
tree762cfc29339c362a7519764dbf97071dcf2fba01 /OTP_VERSION
parent9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53 (diff)
parent3a14bb468b1f3f1f5bef3c18291fe0498429a417 (diff)
downloadotp-ffc5d16de3350e754a4d4da2be42d29b821233e1.tar.gz
otp-ffc5d16de3350e754a4d4da2be42d29b821233e1.tar.bz2
otp-ffc5d16de3350e754a4d4da2be42d29b821233e1.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release ssh: Special treatment of OpenSSH clients >= 7.2 rsa-sha2-* public keys
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 763c7e32aa..22eaaae7d8 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-20.2
+20.2.1