diff options
| author | Hans Nilsson <[email protected]> | 2019-04-26 10:06:47 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-04-26 10:06:47 +0200 |
| commit | 5593c7237c691eeef73a157d0aabe7a254b15912 (patch) | |
| tree | fec956524605e7c75cad91a1a5c154118c81d2fd /make | |
| parent | 62f78b258e83871458ccd3599dbbcc5585ca4104 (diff) | |
| parent | 68a90eb777b5c1e48c0760337fbf2b0b8a9aa6aa (diff) | |
| download | otp-5593c7237c691eeef73a157d0aabe7a254b15912.tar.gz otp-5593c7237c691eeef73a157d0aabe7a254b15912.tar.bz2 otp-5593c7237c691eeef73a157d0aabe7a254b15912.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 05a281bb2c..bab9629cc7 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1 +1 @@ -OTP-15054 +OTP-15772 |