Merge branch 'develop' into group_work

# Conflicts:
#	FFXIVClassic Map Server/ConfigConstants.cs
This commit is contained in:
Filip Maj
2017-01-09 00:19:39 -05:00
14 changed files with 136 additions and 24 deletions

View File

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

View File

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