aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-17 12:30:41 +0100
committerIngela Anderton Andin <[email protected]>2015-02-17 12:30:41 +0100
commit25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8 (patch)
treecd2d1b8506ebc43ad5517247473a9d2cecf2f475 /erts/test
parentef8b1e3e8c908379cec8376ed515c920682224f9 (diff)
parent71a9e62710083023c457fb56e7a1c2d9852baaee (diff)
downloadotp-25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8.tar.gz
otp-25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8.tar.bz2
otp-25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8.zip
Merge branch 'ia/ssl/os-timestamp' into maint
* ia/ssl/os-timestamp: ssl: erlang:timestamp -> os:timestamp Complements commit 450773958165539951cd431a9233ce7666ec20e2
Diffstat (limited to 'erts/test')
0 files changed, 0 insertions, 0 deletions