mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-06-10 14:34:32 +02:00
Merge branch 'develop' into group_work
# Conflicts: # FFXIVClassic Map Server/ConfigConstants.cs
This commit is contained in:
commit
79de4fd1ff
14 changed files with 136 additions and 24 deletions
|
@ -1,5 +1,5 @@
|
|||
[General]
|
||||
server_ip=127.0.0.1
|
||||
server_ip=0.0.0.0
|
||||
showtimestamp = true
|
||||
|
||||
[Database]
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[General]
|
||||
server_ip=127.0.0.1
|
||||
server_ip=0.0.0.0
|
||||
showtimestamp = true
|
||||
|
||||
[Database]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue