diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-20 14:38:04 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-20 14:38:04 +0200 |
| commit | b928e601fcff6df38d7c914050f21db3f85f2d83 (patch) | |
| tree | bc861301fd4ec3ea341a9013d43d9786412a2361 /make | |
| parent | e7439a60c700d7f0c73fa6796a1bff6ab5f39d0c (diff) | |
| parent | d32991afaf3fc5f9f73e3e2448672bb9a1b80101 (diff) | |
| download | otp-b928e601fcff6df38d7c914050f21db3f85f2d83.tar.gz otp-b928e601fcff6df38d7c914050f21db3f85f2d83.tar.bz2 otp-b928e601fcff6df38d7c914050f21db3f85f2d83.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 | 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..3728402492 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,2 @@ +OTP-15823 +OTP-15825 |