aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2018-06-18 14:57:03 +0200
committerHenrik Nord <[email protected]>2018-06-18 14:57:03 +0200
commit9d5af99762b3795c763fb62c1516247bd3f8e12f (patch)
tree98dba4a6a899786ffaafa9edf1b02bb3634b50d1 /lib/crypto/src
parent2e0559f21d2d77c44dbc579f0d6fef7a4d6564c4 (diff)
parent5ca92e2eac1e84fd22f60e7abc3aa2b0ff1cb42b (diff)
downloadotp-9d5af99762b3795c763fb62c1516247bd3f8e12f.tar.gz
otp-9d5af99762b3795c763fb62c1516247bd3f8e12f.tar.bz2
otp-9d5af99762b3795c763fb62c1516247bd3f8e12f.zip
Merge remote-tracking branch 'origin/henrik/Update-copyright'
* origin/henrik/Update-copyright: Update copyright year
Diffstat (limited to 'lib/crypto/src')
-rw-r--r--lib/crypto/src/Makefile2
-rw-r--r--lib/crypto/src/crypto.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index edad0e6b61..1753ba4f36 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 85b484011c..714cba58b9 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.