6ac0cd1c68
# Conflicts: # sql/migrations/20170929190759_characters.sql # src/game/Chat/Chat.cpp # src/game/ObjectMgr.cpp # src/game/Objects/Creature.cpp # src/game/Objects/GameObject.cpp # src/game/Objects/Player.cpp # src/game/Objects/Unit.cpp # src/game/Spells/SpellAuras.cpp # src/game/Spells/SpellEffects.cpp # src/scripts/world/npcs_special.cpp