aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-04-18 13:55:39 +0200
committerRaimo Niskanen <[email protected]>2019-04-18 13:55:39 +0200
commit3694a010d2c5ec63f97405519f4b728eea1f902b (patch)
tree2878db91c64aa4a90e1eb26e2a53d1d262172001 /make
parent4f6115e0027691c508562973398bc76a6f6944fd (diff)
parent98669a56d4cacf5bf6c7413d264dc50289f84bb9 (diff)
downloadotp-3694a010d2c5ec63f97405519f4b728eea1f902b.tar.gz
otp-3694a010d2c5ec63f97405519f4b728eea1f902b.tar.bz2
otp-3694a010d2c5ec63f97405519f4b728eea1f902b.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_merge1
1 files changed, 1 insertions, 0 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..05a281bb2c 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1 @@
+OTP-15054