diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-07 10:31:01 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-07 10:31:01 +0200 |
| commit | d15ec5c180e1eb2e7c4c87f21399c51b4354a639 (patch) | |
| tree | ae52e9dafb43636ea8ac895543902d66f064da58 /make | |
| parent | e07875f133d9723610e4e26e1dd9d94adc645a1a (diff) | |
| parent | 7fe7fa3dde556b5b92522f8279d465bb52baf1f6 (diff) | |
| download | otp-d15ec5c180e1eb2e7c4c87f21399c51b4354a639.tar.gz otp-d15ec5c180e1eb2e7c4c87f21399c51b4354a639.tar.bz2 otp-d15ec5c180e1eb2e7c4c87f21399c51b4354a639.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index bab9629cc7..bf32816fb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1 +1,8 @@ -OTP-15772 +OTP-14746 +OTP-15295 +OTP-15717 +OTP-15758 +OTP-15781 +OTP-15785 +OTP-15793 +OTP-15802 |