diff options
author | John Högberg <[email protected]> | 2018-07-24 08:51:26 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-07-24 08:51:26 +0200 |
commit | a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0 (patch) | |
tree | 53699383cb0e25d246a44f21e76ba60c8332e213 /lib/kernel/vsn.mk | |
parent | c814c388d5c45c8d70426389e702426424086eca (diff) | |
parent | 958ad184c843ce32497eef319f10db7a3a3759c2 (diff) | |
download | otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.gz otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.bz2 otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.zip |
Merge branch 'maint'
* maint:
Fix typo in xmerl_scan:string/1
Updated OTP version
Prepare release
ssl: Engine key trumps certfile option
inets: Prepare for release
inets: Improve error handling
Diffstat (limited to 'lib/kernel/vsn.mk')
0 files changed, 0 insertions, 0 deletions