Files
TrinityCore/sql/updates/world
Vincent_Michael cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
2014-01-13 20:34:21 +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