aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-10-18 16:57:26 +0200
committerHans Nilsson <[email protected]>2018-10-18 16:57:26 +0200
commit7851fcd2170c20b8a2331e8615b03632d7aec4fc (patch)
tree311e139bf5c985d2e7942edb506bd976e892f925 /make
parent04dde143c505da42ca620189cfa1d3400610ebe1 (diff)
parent2e6b0b105b48e072d13672e0ca73107fc75cbcdc (diff)
downloadotp-7851fcd2170c20b8a2331e8615b03632d7aec4fc.tar.gz
otp-7851fcd2170c20b8a2331e8615b03632d7aec4fc.tar.bz2
otp-7851fcd2170c20b8a2331e8615b03632d7aec4fc.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release
Diffstat (limited to 'make')
-rw-r--r--make/otp_version_tickets1
1 files changed, 1 insertions, 0 deletions
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index e69de29bb2..b8220e1a87 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -0,0 +1 @@
+DEVELOPMENT