diff options
| author | Raimo Niskanen <[email protected]> | 2018-03-22 10:06:17 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-03-22 10:06:17 +0100 |
| commit | 0c151c6939a83f9a26a45d24fd504fc4fb2f3f01 (patch) | |
| tree | 0d3c171138d07cbd0eaccbd895dd8a37efb5002d /OTP_VERSION | |
| parent | a59429dcf6f69054e5e82783f7adf8a03c11fcc7 (diff) | |
| parent | c5ee502e6031986983d3596745cad7fd547fd9c2 (diff) | |
| download | otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.gz otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.bz2 otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
ssh: Fix bad spec for double_algs() in ssh.hrl
Test event insert from init
Fix init to allow all actions
Conflicts:
OTP_VERSION
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 06d4ac2bfd..3eda57544c 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -21.0-rc0 +20.3.2 |