forked from mirror/azerothcore-wotlk
7a9d176088
# Conflicts: # .gitignore # data/sql/updates/world/2016_07_28_00.sql # src/server/game/Battlegrounds/Battleground.cpp # src/server/game/Entities/Player/Player.cpp # src/server/game/Entities/Player/Player.h # src/server/scripts/Pet/pet_dk.cpp