diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:47:28 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:47:28 -0300 |
| commit | 9c322449ade0d1952f6ca4dd73cc92413f61ca69 (patch) | |
| tree | 1bff0731c4db0790ef57a2d524d739b1241ffa2c /conf/common | |
| parent | 9c649056dc45d39e88036bdb2bb373c477f8571f (diff) | |
| parent | 255cf7c47f76a6e2f12fc809473ce513c294dfa4 (diff) | |
| download | serverdata-jesusalva/inns.tar.gz serverdata-jesusalva/inns.tar.bz2 serverdata-jesusalva/inns.tar.xz serverdata-jesusalva/inns.zip | |
Merge branch 'master' into jesusalva/innsjesusalva/inns
Diffstat (limited to 'conf/common')
| -rw-r--r-- | conf/common/inter-server.conf | 2 | ||||
| -rw-r--r-- | conf/common/socket.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf index a4122b85..df326a67 100644 --- a/conf/common/inter-server.conf +++ b/conf/common/inter-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2019 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/common/socket.conf b/conf/common/socket.conf index 8b8b2186..eb7d494b 100644 --- a/conf/common/socket.conf +++ b/conf/common/socket.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2019 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by |