mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-14 20:22:23 -04:00
(cherry picked from commit e8f7d41536)
# Conflicts:
# src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp
# src/server/scripts/BrokenIsles/zone_mardum.cpp