diff options
| author | John Högberg <john@erlang.org> | 2021-05-10 15:25:37 +0200 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2021-05-10 15:25:37 +0200 |
| commit | f238fdbd379882af30445453afd163a09d242e44 (patch) | |
| tree | 2df2e616bc2f5cdc890b29f684835676fcdf8ba2 /lib/os_mon | |
| parent | cefe6e38044d587abd1642be1b6ff8a192b590e6 (diff) | |
| parent | f17a44f06c7a51dd22445c6b549ffcd924df56bc (diff) | |
| download | erlang-f238fdbd379882af30445453afd163a09d242e44.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
Diffstat (limited to 'lib/os_mon')
0 files changed, 0 insertions, 0 deletions