diff options
author | Péter Dimitrov <[email protected]> | 2019-02-04 14:44:00 +0100 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2019-02-04 14:44:00 +0100 |
commit | b9e40cb9c0ba28dc30b46f68ec0c4e5327d2eb48 (patch) | |
tree | b335c22911d6e3411c2deba53b1f491243ffee88 /make | |
parent | 92704cd85673cca525e772d3ef8118925b86ef8c (diff) | |
parent | 934f9974eb6bec43cd9445ec0f5019a4d1389428 (diff) | |
download | otp-b9e40cb9c0ba28dc30b46f68ec0c4e5327d2eb48.tar.gz otp-b9e40cb9c0ba28dc30b46f68ec0c4e5327d2eb48.tar.bz2 otp-b9e40cb9c0ba28dc30b46f68ec0c4e5327d2eb48.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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 4e6277bc58..921f8b53fe 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,4 +1 @@ -OTP-15536 -OTP-15537 -OTP-15538 -OTP-15544 +OTP-15554 |