diff options
| author | Raimo Niskanen <raimo@erlang.org> | 2019-07-12 11:43:54 +0200 |
|---|---|---|
| committer | Raimo Niskanen <raimo@erlang.org> | 2019-07-12 11:43:54 +0200 |
| commit | 7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff (patch) | |
| tree | 581454a3f382e2101b21b665883970d01c21b8d8 /erts/preloaded | |
| parent | 963937709bb6a50735df028b3f672f9d46d2f4b2 (diff) | |
| parent | 4e0ab84c9f5f57bf73f72294789a447f458291f5 (diff) | |
| download | erlang-7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff.tar.gz | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/ssl/doc/src/notes.xml
# lib/ssl/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'erts/preloaded')
0 files changed, 0 insertions, 0 deletions