Tahir Akhlaq 6f5a480cbd Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai
# Conflicts:
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
2017-08-26 20:17:16 +01:00
..
2017-07-11 09:08:50 -05:00
2017-07-11 09:08:50 -05:00
2017-07-11 09:08:50 -05:00
2017-07-11 09:08:50 -05:00