diff options
author | John Högberg <[email protected]> | 2019-07-11 11:24:19 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2019-07-11 11:24:19 +0200 |
commit | 220eeb3670e536b55c8e6812de86481cedd83bfe (patch) | |
tree | 1501c318f6b2e4b48c6d1154d2b6a0a64e77b7c1 /erts/preloaded/ebin | |
parent | d2c096de3c677c20d4a149bec6a9346aea9ccf4d (diff) | |
parent | 3967d28c05dae77db30b15e56eb4ececf4f1afef (diff) | |
download | otp-220eeb3670e536b55c8e6812de86481cedd83bfe.tar.gz otp-220eeb3670e536b55c8e6812de86481cedd83bfe.tar.bz2 otp-220eeb3670e536b55c8e6812de86481cedd83bfe.zip |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'erts/preloaded/ebin')
0 files changed, 0 insertions, 0 deletions