diff options
author | Hans Nilsson <[email protected]> | 2019-04-26 10:06:49 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2019-04-26 10:06:49 +0200 |
commit | cc804d6650f81617a4a6fd08617be43cf8aa6c2e (patch) | |
tree | 34c5f9390e8701f741f720e90bb5cdac6d431df7 /bin | |
parent | a90da2351b7088547b93413a3adf779d936bd056 (diff) | |
parent | 5593c7237c691eeef73a157d0aabe7a254b15912 (diff) | |
download | otp-cc804d6650f81617a4a6fd08617be43cf8aa6c2e.tar.gz otp-cc804d6650f81617a4a6fd08617be43cf8aa6c2e.tar.bz2 otp-cc804d6650f81617a4a6fd08617be43cf8aa6c2e.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions