57100544c9
# Conflicts: # project/assets/database/globals.json |
||
---|---|---|
.. | ||
bots | ||
hideout | ||
locales | ||
locations | ||
match | ||
templates | ||
traders | ||
globals.json | ||
server.json | ||
settings.json |
57100544c9
# Conflicts: # project/assets/database/globals.json |
||
---|---|---|
.. | ||
bots | ||
hideout | ||
locales | ||
locations | ||
match | ||
templates | ||
traders | ||
globals.json | ||
server.json | ||
settings.json |