Skip to content
Commit 4231f89d authored by Ryan Yappert's avatar Ryan Yappert
Browse files

Merge branch 'necromancer_bones_fixes' into masterTest 

# Conflicts:
#	game/modules/tome/data/talents/spells/eradication.lua
#	game/modules/tome/data/talents/spells/master-of-bones.lua
parents b5e41cbe 5b66fb3b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment