diff options
| author | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:52 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:52 +0200 |
| commit | 91e6f3a30b8d6e779050f6e7fd418479bc9f9948 (patch) | |
| tree | 59d10763782021dc51ce7471f73f83ce93cf0a8f /erts/doc/src/ref_man.xml | |
| parent | be44d6827e2374a43068b35de85ed16441c771be (diff) | |
| parent | abc64999241276879208d077f9d94101366a414e (diff) | |
| download | otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.tar.gz otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.tar.bz2 otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'erts/doc/src/ref_man.xml')
0 files changed, 0 insertions, 0 deletions