mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 08:55:32 +01:00
# Conflicts: # src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp # src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp # src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp # src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h # src/server/scripts/Spells/spell_quest.cpp