mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-17 21:50:50 -04:00
4ba229ad2c
(cherry picked from commit e8f7d41536)
# Conflicts:
# src/server/scripts/BrokenIsles/TrialOfValor/boss_guarm.cpp
# src/server/scripts/BrokenIsles/zone_mardum.cpp