diff options
author | Hans Nilsson <[email protected]> | 2019-04-12 14:48:21 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2019-04-12 14:48:21 +0200 |
commit | be1c449af5afb7b6494b7e2629977fbc024de087 (patch) | |
tree | 42e6dee96da46b551ea67494905ed836f67316e0 /OTP_VERSION | |
parent | c24ea58313c7a2b837831c9c8f9439d0ababe5df (diff) | |
parent | 7ad05d6dd4230061e8120ae8c0dec2535f47e294 (diff) | |
download | otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.gz otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.bz2 otp-be1c449af5afb7b6494b7e2629977fbc024de087.zip |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
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 8a3ec61bb7..cc4d727a5d 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -21.3.3 +21.3.4 |