Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into develop

Browse Source

# Conflicts:
#	FFXIVClassic Map Server/packets/send/Actor/SetActorSubStatPacket.cs

...

This commit is contained in:

Filip Maj 2017-05-16 23:44:42 -04:00

parent c67c5f3bdf 5d65965ec0

commit 52cacb1ded

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available