mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 00:48:56 +01:00
(cherry picked from commit 3bf6698116)
# Conflicts:
# src/server/game/Handlers/BlackMarketHandler.cpp
# src/server/game/Loot/LootItemStorage.cpp
# src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
# src/server/shared/DataStores/DB2DatabaseLoader.cpp