mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-16 07:30:42 +01:00
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Spells/SpellMgr.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/World/npcs_special.cpp src/server/worldserver/worldserver.conf.dist