diff options
| author | Rickard Green <[email protected]> | 2019-03-06 17:03:03 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-06 17:03:03 +0100 |
| commit | 933e1671a99958540666781082188f7335fb2823 (patch) | |
| tree | df022e81837a78d7a7da3843be293aa87fb6aaa7 /make | |
| parent | 5575fb4d3ced54d6ed8a0afababccb1fe78c77c0 (diff) | |
| parent | 0ec68a93247ca0ea1d44a2465767dffa4450411a (diff) | |
| download | otp-933e1671a99958540666781082188f7335fb2823.tar.gz otp-933e1671a99958540666781082188f7335fb2823.tar.bz2 otp-933e1671a99958540666781082188f7335fb2823.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 32e6923ce9..ff967634a2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,2 +1,3 @@ -OTP-14728 -OTP-15573 +OTP-15551 +OTP-15651 +OTP-15652 |