Files
TrinityCore/sql/updates/world
Vincent_Michael 7cc4828554 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
2014-01-26 18:22:06 +01:00
..
2013-08-16 21:33:39 +02:00
2013-12-12 13:46:22 +02:00
2013-12-22 13:06:59 -03:30
2013-12-23 23:55:15 +01:00