diff options
| author | Rickard Green <[email protected]> | 2019-03-21 20:46:30 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-21 20:46:30 +0100 |
| commit | db4eefa49350bb18089f80e21464865f641b614f (patch) | |
| tree | 91d364eedc18c31122f9f424d1d39c9bfb338be1 /OTP_VERSION | |
| parent | f5c90a31ebd6e9f09588f176ea6895406d1f7d92 (diff) | |
| parent | 7e6fff1e849998a3dd747b4d3cf35f39cb896aa0 (diff) | |
| download | otp-db4eefa49350bb18089f80e21464865f641b614f.tar.gz otp-db4eefa49350bb18089f80e21464865f641b614f.tar.bz2 otp-db4eefa49350bb18089f80e21464865f641b614f.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 0fac3b01f5..b642a24f71 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -21.3.1 +21.3.2 |