mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-16 15:40:45 +01:00
# Conflicts: # sql/base/auth_database.sql # sql/old/4.3.4/auth/19_2017_06_18/2018_01_09_00_auth.sql # sql/old/4.3.4/world/23_2017_11_15/2018_01_09_00_world.sql # src/server/game/Accounts/RBAC.h # src/server/game/Combat/ThreatManager.h