aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-09-20 10:50:32 +0200
committerHans Nilsson <[email protected]>2018-09-21 12:58:52 +0200
commit299291fd3da85eff4a1f5d9a602d514c4ac9e6f6 (patch)
tree97df05999f90a6cefb69b8a5c7f799854a1a7537 /lib/megaco
parentd04b53936d5e9f84a3066ecd466993671b1428bf (diff)
downloadotp-299291fd3da85eff4a1f5d9a602d514c4ac9e6f6.tar.gz
otp-299291fd3da85eff4a1f5d9a602d514c4ac9e6f6.tar.bz2
otp-299291fd3da85eff4a1f5d9a602d514c4ac9e6f6.zip
crypto: Fix accidental merge
Commit 8c47a7657d03777a03a6838c7ec937b6347d07f8 accidently reverted the changes in lib/crypto/src/crypto.erl correctly introduced in e8de0736005e91afd992e49f434e08c940eddfa0 This fix re-introduces the correct changes.
Diffstat (limited to 'lib/megaco')
0 files changed, 0 insertions, 0 deletions