diff options
| author | Henrik Nord <[email protected]> | 2018-09-21 12:25:11 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2018-09-21 12:25:11 +0200 |
| commit | e3cdf8208a08fe6ceb283108729aee6315af9547 (patch) | |
| tree | 124403a63fd4ed09e029b46ecf30f87660fbacf3 /lib/inets | |
| parent | ab62dd2e77afac117f431bda449da811b140c153 (diff) | |
| parent | d04b53936d5e9f84a3066ecd466993671b1428bf (diff) | |
| download | otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.gz otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.bz2 otp-e3cdf8208a08fe6ceb283108729aee6315af9547.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/mod_security.xml | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_server/httpd_file.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml index d65d2ff998..6f3f3c048a 100644 --- a/lib/inets/doc/src/mod_security.xml +++ b/lib/inets/doc/src/mod_security.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1998</year><year>2016</year> + <year>1998</year><year>2018</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl index fb71834e95..bf7554bd08 100644 --- a/lib/inets/src/http_server/httpd_file.erl +++ b/lib/inets/src/http_server/httpd_file.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2016. All Rights Reserved. +%% Copyright Ericsson AB 2006-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. |