mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 16:38:42 +01:00
# Conflicts: # sql/updates/world/3.3.5/2018_01_10_04_world_335.sql # src/server/game/Combat/ThreatManager.h # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Player/Player.cpp # src/server/scripts/Kalimdor/boss_azuregos.cpp