mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-23 02:25:38 +01:00
# Conflicts: # src/server/game/Instances/InstanceScript.cpp # src/server/game/Instances/InstanceScript.h # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp # src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp # src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp # src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp # src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp # src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp # src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp Co-authored-by: Shauren <shauren.trinity@gmail.com>