diff options
| author | Hans Nilsson <[email protected]> | 2019-04-12 14:48:21 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-04-12 14:48:21 +0200 |
| commit | be1c449af5afb7b6494b7e2629977fbc024de087 (patch) | |
| tree | 42e6dee96da46b551ea67494905ed836f67316e0 /make | |
| parent | c24ea58313c7a2b837831c9c8f9439d0ababe5df (diff) | |
| parent | 7ad05d6dd4230061e8120ae8c0dec2535f47e294 (diff) | |
| download | otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.gz otp-be1c449af5afb7b6494b7e2629977fbc024de087.tar.bz2 otp-be1c449af5afb7b6494b7e2629977fbc024de087.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index a7a96d733b..01d0313dc9 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +1,6 @@ -OTP-15704 -OTP-15706 -OTP-15709 +OTP-15716 +OTP-15750 +OTP-15753 +OTP-15757 +OTP-15762 +OTP-15763 |