aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-06-18 10:13:20 +0200
committerJohn Högberg <[email protected]>2019-06-18 10:13:20 +0200
commit63dec44359b45e735a8328a84ecc1d3826ee82f1 (patch)
treecade34322e2c6fbb6e4271409f0a8e29d05c8376 /erts/lib
parenta088080c66fb89ba5bd205cc4d7af85913d10c7d (diff)
parente5b0b72d7213788ae6d4f01be14ba48ac463589d (diff)
downloadotp-63dec44359b45e735a8328a84ecc1d3826ee82f1.tar.gz
otp-63dec44359b45e735a8328a84ecc1d3826ee82f1.tar.bz2
otp-63dec44359b45e735a8328a84ecc1d3826ee82f1.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION
Diffstat (limited to 'erts/lib')
0 files changed, 0 insertions, 0 deletions