mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-23 02:25:38 +01:00
(cherry picked from commit 309ba22a15)
# Conflicts:
# src/server/scripts/BrokenIsles/zone_mardum.cpp
# src/server/scripts/DragonIsles/AberrusTheShadowedCrucible/aberrus_the_shadowed_crucible.cpp
# src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
# src/server/scripts/KulTiras/WaycrestManor/waycrest_manor.cpp
# src/server/scripts/KulTiras/zone_boralus.cpp
# src/server/scripts/Shadowlands/SanctumOfDomination/boss_sylvanas_windrunner.cpp
# src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp
# src/server/scripts/Zandalar/KingsRest/kings_rest.cpp