diff options
| author | Rickard Green <[email protected]> | 2019-04-15 11:32:58 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-04-15 11:32:58 +0200 |
| commit | 22af152828a9b38aeab44d71300b4eca813964c9 (patch) | |
| tree | bd4622f73085ae4ea2c4ed68c01b177fd84218e2 /make | |
| parent | 452ba2756ef87974e44c283f6259ee535cbf7f4e (diff) | |
| parent | 5d05cf5417b9f447a2de1cfaf705371c9ba64d50 (diff) | |
| download | otp-22af152828a9b38aeab44d71300b4eca813964c9.tar.gz otp-22af152828a9b38aeab44d71300b4eca813964c9.tar.bz2 otp-22af152828a9b38aeab44d71300b4eca813964c9.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, 3 insertions, 6 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 01d0313dc9..52e2e9cb78 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,6 +1,3 @@ -OTP-15716 -OTP-15750 -OTP-15753 -OTP-15757 -OTP-15762 -OTP-15763 +OTP-15766 +OTP-15768 +OTP-15769 |