mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 08:28:32 +01:00
(cherry picked from commit b0c8a9411e)
# Conflicts:
# src/server/game/Guilds/Guild.cpp
# src/server/game/Handlers/CharacterHandler.cpp
# src/server/game/Handlers/QueryHandler.cpp
# src/server/game/Handlers/TaxiHandler.cpp