diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
| commit | 622daf3b96666f8bbabec44a15b26a188a83b95e (patch) | |
| tree | 706377087e70525e9bdc68b2f98911d56b915e5d /lib/inets/src/http_server/httpd_conf.erl | |
| parent | 09c46998b3a4b0060b3ff3799c142d564f91f517 (diff) | |
| parent | 5acac472723ef5cac6a944caf7b7ec4320c003e9 (diff) | |
| download | otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.gz otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.bz2 otp-622daf3b96666f8bbabec44a15b26a188a83b95e.zip | |
Merge branch 'dev' into major
* dev:
Update copyright years
Diffstat (limited to 'lib/inets/src/http_server/httpd_conf.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index 1ff73d756b..7646300409 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in |