mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-17 08:00:48 +01:00
Conflicts: src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/DataStores/DBCStores.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/World/World.cpp src/server/scripts/Commands/cs_misc.cpp src/server/worldserver/worldserver.conf.dist