mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 08:55:32 +01:00
(cherry picked from commit bffaa92633)
# Conflicts:
# src/server/game/Entities/Pet/Pet.h
# src/server/game/Texts/CreatureTextMgr.cpp