mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-20 15:01:38 -04:00
6568b0624d
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