1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-23 05:07:47 +00:00
project-meteor-server/data
Tahir Akhlaq 37d91480f9 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands
# Conflicts:
#	FFXIVClassic Common Class Lib/packages.config
#	FFXIVClassic Lobby Server/Program.cs
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/Program.cs
#	FFXIVClassic Map Server/actors/Actor.cs
2016-06-18 05:59:42 +01:00
..
scripts Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands 2016-06-18 05:59:42 +01:00
lobby_config.ini Fixed logs on lobby. 2016-06-15 20:06:08 -04:00
map_config.ini Fixed logs on lobby. 2016-06-15 20:06:08 -04:00