Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Object/Updates/UpdateFields.h src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Spells/spell_druid.cpp
This commit is contained in:
commit
6568b0624d
566 files changed
+29934
-14984
No files matched your search
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user