diff options
| author | John Högberg <[email protected]> | 2019-06-18 09:42:33 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-18 09:42:33 +0200 |
| commit | 39f0bd930bd028c5520da0430056994e4c5925c3 (patch) | |
| tree | 763eb7333139bba0524d1a50607230a0efe0ba2f /lib/ssl/test/inet_crypto_dist.erl | |
| parent | c5ab02e56946b5edd0c9b2705214aa6f4fd6d6ba (diff) | |
| parent | 348e328375fb774b3fa919ffd1c4811367406516 (diff) | |
| download | otp-39f0bd930bd028c5520da0430056994e4c5925c3.tar.gz otp-39f0bd930bd028c5520da0430056994e4c5925c3.tar.bz2 otp-39f0bd930bd028c5520da0430056994e4c5925c3.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/notes.xml
# erts/vsn.mk
# lib/common_test/doc/src/notes.xml
# lib/common_test/vsn.mk
# lib/kernel/doc/src/notes.xml
# lib/kernel/vsn.mk
# lib/public_key/doc/src/notes.xml
# lib/public_key/vsn.mk
# lib/ssl/doc/src/notes.xml
# lib/ssl/vsn.mk
# lib/stdlib/doc/src/notes.xml
# lib/stdlib/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'lib/ssl/test/inet_crypto_dist.erl')
0 files changed, 0 insertions, 0 deletions