diff options
| author | John Högberg <[email protected]> | 2019-07-03 10:32:00 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-03 10:32:00 +0200 |
| commit | bfe0b13596524cf4b8969314c99e008a18b425c9 (patch) | |
| tree | b8ea6be666902abe96d7ddf3c19b7ffe4a84f2ed /erts/obj | |
| parent | 9922ae2890c44db1e2b162ae603e729852e41aef (diff) | |
| parent | b0a8268780f3f24cbfd9698a0ca08d166bbbd798 (diff) | |
| download | otp-bfe0b13596524cf4b8969314c99e008a18b425c9.tar.gz otp-bfe0b13596524cf4b8969314c99e008a18b425c9.tar.bz2 otp-bfe0b13596524cf4b8969314c99e008a18b425c9.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions