mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-21 23:38:54 -04:00
03505a3a42
Conflicts: src/server/game/Entities/Player/Player.h src/server/game/Quests/QuestDef.cpp src/server/game/Quests/QuestDef.h src/server/game/World/World.cpp src/server/game/World/World.h src/server/scripts/Commands/cs_reload.cpp