diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-18 13:38:41 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-18 13:38:41 +0100 |
| commit | 7a8ee449b79da291ea702c69a7ed4ed6cdae286c (patch) | |
| tree | 0764a96b9501552d255a850aadb3025ed051ecc5 /make | |
| parent | d04ceae537e037555cb0ae962f3164dc6c499340 (diff) | |
| parent | f30b1052c7097a95faaba272feccc6190682a7f8 (diff) | |
| download | otp-7a8ee449b79da291ea702c69a7ed4ed6cdae286c.tar.gz otp-7a8ee449b79da291ea702c69a7ed4ed6cdae286c.tar.bz2 otp-7a8ee449b79da291ea702c69a7ed4ed6cdae286c.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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..32e6923ce9 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,2 @@ +OTP-14728 +OTP-15573 |