mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-17 08:00:48 +01:00
(cherry picked from commit e8f7d41536)
# Conflicts:
# src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp
# src/server/scripts/BrokenIsles/zone_mardum.cpp