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

Merge branch 'master' into Randart_Randboss_Updates

Conflicts:
	game/modules/tome/data/talents.lua
parents ec68b3fe db6e8a3f
No related branches found
No related tags found
1 merge request!16Randart randboss updates
Showing
with 227 additions and 99 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