diff options
| author | Björn Gustavsson <bjorn@erlang.org> | 2020-02-03 14:24:44 +0100 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2020-02-03 14:24:44 +0100 |
| commit | a7d51e6918a5822cc6eadfa674abab192a9528f1 (patch) | |
| tree | cc3d3106ff6067d37644efa7d14e02616acef38a /make | |
| parent | e99c8eb3c21ba3254080cfb8d5e75e0937351469 (diff) | |
| parent | d9523afc8bb54fa9772462170018f982359c0e0d (diff) | |
| download | erlang-a7d51e6918a5822cc6eadfa674abab192a9528f1.tar.gz | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/notes.xml
# erts/vsn.mk
# lib/stdlib/doc/src/notes.xml
# lib/stdlib/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 2ba99b5dbc..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +0,0 @@ -OTP-16358 -OTP-16436 -OTP-16441 |