Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/SpellInfo.h src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_priest.cpp src/server/scripts/Spells/spell_warlock.cpp
This commit is contained in:
commit
c57fa8f781
7 files changed
+251
-17
No files matched your search
@@ -130,7 +130,6 @@ class spell_warl_aftermath : public SpellScriptLoader
|
||||
};
|
||||
|
||||
// 710 - Banish
|
||||
/// Updated 4.3.4
|
||||
class spell_warl_banish : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
|
||||
Reference in new issue
Block a user