# Conflicts:
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
#	data/scripts/global.lua
This commit is contained in:
Tahir Akhlaq 2016-06-24 22:13:17 +01:00
commit 5fc0e0eeca
412 changed files with 2364 additions and 1832 deletions

View file

@ -1,5 +1,5 @@
[General]
server_ip=127.0.0.1
server_ip=192.168.0.2
showtimestamp = true
[Database]