diff options
| author | Raimo Niskanen <raimo@erlang.org> | 2021-03-03 09:37:18 +0100 |
|---|---|---|
| committer | Raimo Niskanen <raimo@erlang.org> | 2021-03-03 09:37:18 +0100 |
| commit | 3ae9aa2f555171c84e123720d2cfe84b291a735c (patch) | |
| tree | e2b55f7a26aae23fd58eecc9b10623a6b46754be /make/otp_version_tickets_in_merge | |
| parent | 6f3904a82d4db5cbfb25654e54a34f38d44f4243 (diff) | |
| parent | 122ab644d8bf71c8afd099409e0032beb61aa464 (diff) | |
| download | erlang-3ae9aa2f555171c84e123720d2cfe84b291a735c.tar.gz | |
Merge branch 'maint-23' into maint
* maint-23:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make/otp_version_tickets_in_merge')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 51f2c607f7..f66f16de77 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,4 +1,4 @@ +OTP-12960 OTP-16607 -OTP-17173 -OTP-17205 -OTP-17220 +OTP-17227 +OTP-17228 |