summaryrefslogtreecommitdiff
path: root/lib/eunit/doc/src/Makefile
diff options
context:
space:
mode:
authorHans Nilsson <hans@erlang.org>2020-02-28 09:43:33 +0100
committerHans Nilsson <hans@erlang.org>2020-02-28 09:43:33 +0100
commit773b77a8bfe2f2264fc1f49dd594646eec302154 (patch)
tree997164e1a5a64996e49f942cac9e87cfba7c32be /lib/eunit/doc/src/Makefile
parent6f5811d3b56034d90b305b7265450b6934b55832 (diff)
parent8b1efc6cc3fa3b64bae51db4943f77f8ddd1399c (diff)
downloaderlang-773b77a8bfe2f2264fc1f49dd594646eec302154.tar.gz
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssh/doc/src/notes.xml # lib/ssh/vsn.mk # make/otp_version_tickets # otp_versions.table
Diffstat (limited to 'lib/eunit/doc/src/Makefile')
0 files changed, 0 insertions, 0 deletions