Skip to content
Snippets Groups Projects
Commit 2d5817b6 authored by Hachem_Muche's avatar Hachem_Muche
Browse files

Merge branch 'master' into SomeScalingUpdates

Needs some scaling fixes.

Conflicts:
	game/modules/tome/data/birth/classes/rogue.lua
	game/modules/tome/data/talents/cunning/dirty.lua
	game/modules/tome/data/talents/techniques/duelist.lua
parents 7846e38f e5b55bff
No related branches found
No related tags found
1 merge request!367Some Scaling Updates
Showing
with 99 additions and 66 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment