mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 08:28:32 +01:00
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Commands/cs_misc.cpp