mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-17 16:10:49 +01:00
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/tools/vmap4_extractor/mpq_libmpq04.h