mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 16:38:42 +01:00
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Object/Updates/UpdateFields.h src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Spells/spell_druid.cpp