diff options
| author | John Högberg <[email protected]> | 2019-07-03 10:31:58 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-03 10:31:58 +0200 |
| commit | b0a8268780f3f24cbfd9698a0ca08d166bbbd798 (patch) | |
| tree | 671df9369e24377b40b80145f37564209e05d2d1 /make | |
| parent | 9e49cf35723d7436dbd0ec2f3c8da165b6eb906a (diff) | |
| parent | 7999631c63998cffc07bbcc91dd86cbe709dde5f (diff) | |
| download | otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.tar.gz otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.tar.bz2 otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.zip | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e69de29bb2..b741526c88 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,10 @@ +OTP-15900 +OTP-15908 +OTP-15909 +OTP-15910 +OTP-15913 +OTP-15922 +OTP-15930 +OTP-15938 +OTP-15939 +OTP-15941 |