diff options
author | Hans Nilsson <[email protected]> | 2017-10-09 12:04:49 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2017-10-09 12:04:49 +0200 |
commit | d68b3def1b2d448d1585182a0b987e79333b33b4 (patch) | |
tree | ee03096415bb249e5cf52dc5ada7b5f8f0f1dd77 /OTP_VERSION | |
parent | d52b0496f9f6ef15a98a77749c11dd662a1a951f (diff) | |
parent | 3f4aac5b00959d3f0ddfaf54a3163cd75053dd24 (diff) | |
download | otp-d68b3def1b2d448d1585182a0b987e79333b33b4.tar.gz otp-d68b3def1b2d448d1585182a0b987e79333b33b4.tar.bz2 otp-d68b3def1b2d448d1585182a0b987e79333b33b4.zip |
Merge branch 'maint' into hans/ssh/ssh_dbg_hostkey/OTP-14658
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 2e73f8d2aa..2a0e5e0a15 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -20.1 +20.1.1 |