mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-20 17:27:36 +01:00
Conflicts: src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/SpellInfo.h src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_priest.cpp src/server/scripts/Spells/spell_warlock.cpp