diff options
| author | Rickard Green <rickard@erlang.org> | 2020-01-13 11:26:40 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-01-13 11:26:40 +0100 |
| commit | 8d693d66ad6ea8916cbab0369e8f0bee01e92b46 (patch) | |
| tree | f9969ab752bb9ed3fe8c35a4157bce9b554aaf19 /make/otp_version_tickets_in_merge | |
| parent | ec554ae192eebb5be517976ee7116766e618c750 (diff) | |
| parent | 11b70e35e2322819d3b1bbe6a9af17800671394c (diff) | |
| download | erlang-8d693d66ad6ea8916cbab0369e8f0bee01e92b46.tar.gz | |
Merge branch 'maint-22' into maint
* maint-22:
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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..76050459e4 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,7 @@ +OTP-16333 +OTP-16371 +OTP-16373 +OTP-16375 +OTP-16376 +OTP-16378 +OTP-16379 |