Files
trickerer c6ab8cefae Merge branch '3.3.5' into npcbots_3.3.5
# Conflicts:
#	src/common/Common.h
#	src/server/database/Database/Implementation/CharacterDatabase.cpp
#	src/server/database/Database/Implementation/CharacterDatabase.h
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Spells/SpellInfo.cpp
#	src/server/scripts/Pet/pet_dk.cpp
2025-08-03 15:38:01 +07:00
..