diff options
| author | Rickard Green <[email protected]> | 2019-04-15 11:32:58 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-04-15 11:32:58 +0200 |
| commit | 22af152828a9b38aeab44d71300b4eca813964c9 (patch) | |
| tree | bd4622f73085ae4ea2c4ed68c01b177fd84218e2 /OTP_VERSION | |
| parent | 452ba2756ef87974e44c283f6259ee535cbf7f4e (diff) | |
| parent | 5d05cf5417b9f447a2de1cfaf705371c9ba64d50 (diff) | |
| download | otp-22af152828a9b38aeab44d71300b4eca813964c9.tar.gz otp-22af152828a9b38aeab44d71300b4eca813964c9.tar.bz2 otp-22af152828a9b38aeab44d71300b4eca813964c9.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 cc4d727a5d..b29081af6c 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -21.3.4 +21.3.5 |