diff options
| author | Rickard Green <rickard@erlang.org> | 2021-09-30 13:13:41 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2021-09-30 13:13:41 +0200 |
| commit | 20c0c5a38742f5512a04b665bbce7065539500ba (patch) | |
| tree | d8fb8cf17d4a0c8b27c543ffd2021a511d824fa6 /make/otp_version_tickets_in_merge | |
| parent | 0efa5ed6563614b2e68be9790c7b6bb3205658de (diff) | |
| parent | 2d9f944082cccceadf7b7f5a146df2711839ca3d (diff) | |
| download | erlang-20c0c5a38742f5512a04b665bbce7065539500ba.tar.gz | |
Merge branch 'maint-24' into maint
* maint-24:
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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..775591c8b2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,8 @@ +OTP-17640 +OTP-17641 +OTP-17642 +OTP-17646 +OTP-17647 +OTP-17649 +OTP-17651 +OTP-17665 |