diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2021-11-18 16:01:09 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2021-11-18 16:01:09 +0100 |
| commit | 6d28a9d63d406b2de7821659214c3b251a6d0f5c (patch) | |
| tree | b5b7f26cbc403884ac5fe2530a20143323a5be93 /make | |
| parent | f2cfea03520d106a46d24d0bbde9ebc631c532c6 (diff) | |
| parent | 2a89aa5019bb691f93db9fc72bb055013bdc545e (diff) | |
| download | erlang-6d28a9d63d406b2de7821659214c3b251a6d0f5c.tar.gz | |
Merge branch 'maint-24' into maint
* maint-24:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..9bece18ada 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,2 @@ +OTP-17756 +OTP-17757 |