Files
TrinityCore/sql/updates/world
Vincent-Michael 0710f480b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
2013-07-28 18:41:57 +02:00
..