aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-09 10:18:08 +0100
committerIngela Anderton Andin <[email protected]>2015-02-09 10:18:08 +0100
commit33156218401ba0ba489d0d787367af82f56c5f3c (patch)
tree853cfb2b408c5c4f8ffa36a27d10f7612da2ca0e /lib/common_test
parentbca4b9783e9f2d6845b970f23f1b2f9a0ded7121 (diff)
parent450773958165539951cd431a9233ce7666ec20e2 (diff)
downloadotp-33156218401ba0ba489d0d787367af82f56c5f3c.tar.gz
otp-33156218401ba0ba489d0d787367af82f56c5f3c.tar.bz2
otp-33156218401ba0ba489d0d787367af82f56c5f3c.zip
Merge branch 'ia/ssl/timestamp' into maint
* ia/ssl/timestamp: ssl: erlang:timestamp -> os:timestamp
Diffstat (limited to 'lib/common_test')
0 files changed, 0 insertions, 0 deletions