mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-21 07:22:02 -04:00
fe90fdcba1
(cherry picked from commit 3cd19d3b30)
# Conflicts:
# src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
# src/server/game/Handlers/NPCHandler.cpp
# src/server/game/Server/Packets/ChatPackets.cpp
# src/server/game/Server/Packets/NPCPackets.h
# src/server/game/Server/Packets/PartyPackets.h
# src/server/game/Server/Packets/PetPackets.cpp
# src/server/game/Server/Packets/PetPackets.h
# src/server/game/Server/Packets/TicketPackets.h
# src/server/game/Server/Packets/VoicePackets.h
# src/server/game/Server/Packets/WardenPackets.h
# src/server/scripts/Commands/cs_cheat.cpp