diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-15 09:55:55 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-15 09:55:55 +0200 |
| commit | 1c19c9af6531f600bf3368b8c7baed243cecc2a3 (patch) | |
| tree | fea029761cbd12f2182c60b9aa06325d857ce762 /lib/ssl/src | |
| parent | cd29130a86e77108e75e770afea5952f47167067 (diff) | |
| parent | 3b2c1dd3fdf1fec362cff3a88e188ef989ee79e5 (diff) | |
| download | otp-1c19c9af6531f600bf3368b8c7baed243cecc2a3.tar.gz otp-1c19c9af6531f600bf3368b8c7baed243cecc2a3.tar.bz2 otp-1c19c9af6531f600bf3368b8c7baed243cecc2a3.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/ssl/doc/src/notes.xml
# lib/ssl/vsn.mk
# lib/tools/doc/src/notes.xml
# lib/tools/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'lib/ssl/src')
0 files changed, 0 insertions, 0 deletions