diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-10-22 18:31:27 +0200 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-10-22 18:31:27 +0200 |
| commit | ff8f832ba0f48f40274a761526e79d5453d63806 (patch) | |
| tree | 8dc4f16ee9367f7b44d2df79a1b444c8ceb451f8 /bans.cfg | |
| parent | 1208292e57553db14932a2eda41264cc570da01f (diff) | |
| parent | 977683d4f8f82633ba9ba6a26607b5451bd0c592 (diff) | |
| download | zcatch-ff8f832ba0f48f40274a761526e79d5453d63806.tar.gz zcatch-ff8f832ba0f48f40274a761526e79d5453d63806.zip | |
Merge branch 'banmaster_v2' into zCatch
Conflicts: .gitignore banmasters.cfg src/banmaster/banmaster.cpp src/engine/server/server.cpp src/engine/shared/network.h src/engine/shared/network_server.cpp
Diffstat (limited to 'bans.cfg')
| -rw-r--r-- | bans.cfg | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bans.cfg b/bans.cfg index bc3e1d65..a32469c6 100644 --- a/bans.cfg +++ b/bans.cfg @@ -1,2 +1 @@ unban_all -bind 127.0.0.1:8302 |