diff options
author | John Högberg <[email protected]> | 2019-06-13 10:28:56 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2019-06-13 10:28:56 +0200 |
commit | fb2ba690b23caba3a20a2f04e359c6d5c3e33ace (patch) | |
tree | bb957fa2ce0ee8d7e847d0e713cffca650c43cae /erts/doc/Makefile | |
parent | 7a767d7b25cb0f55031728eb73d3bbad9a5f2db5 (diff) | |
parent | 8fb03c024165d6777f429e495af676dfe020e78a (diff) | |
download | otp-fb2ba690b23caba3a20a2f04e359c6d5c3e33ace.tar.gz otp-fb2ba690b23caba3a20a2f04e359c6d5c3e33ace.tar.bz2 otp-fb2ba690b23caba3a20a2f04e359c6d5c3e33ace.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
Diffstat (limited to 'erts/doc/Makefile')
0 files changed, 0 insertions, 0 deletions