diff options
| author | Lukas Larsson <[email protected]> | 2019-01-25 13:21:49 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-25 13:21:49 +0100 |
| commit | ecbfc52f06a71ed553a5986c6a13bc893586615b (patch) | |
| tree | 17b5d55a6f1c940608f64628888651394e3791e7 /make | |
| parent | 839b3dfc6295a9bbfb42a9af8820c9e580beaea2 (diff) | |
| parent | 35f51c7f057943c25ccb7997526c9d47aed0cd0b (diff) | |
| download | otp-ecbfc52f06a71ed553a5986c6a13bc893586615b.tar.gz otp-ecbfc52f06a71ed553a5986c6a13bc893586615b.tar.bz2 otp-ecbfc52f06a71ed553a5986c6a13bc893586615b.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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge new file mode 100644 index 0000000000..4e6277bc58 --- /dev/null +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,4 @@ +OTP-15536 +OTP-15537 +OTP-15538 +OTP-15544 |