Commit Graph
5 Commits
Author SHA1 Message Date
yogurt 4032258e76 More merge fixes! 2017-07-11 11:52:54 -05:00
yogurt 4dee26e136 Fixing more merge errors. I'm bad at this 2017-07-11 09:50:54 -05:00
yogurt 86a2e4aff3 Fixing merge error 2017-07-11 09:45:11 -05:00
yogurt b2e86d282a Merge branch 'ai-open' of https://bitbucket.org/takhlaq/ffxiv-classic-server into ai-open 2017-07-11 09:40:10 -05:00
yogurt efdec5e472 Add equip ability functions
Fix EquipAbility SQL query
2017-07-11 09:08:50 -05:00