Skip to content
Snippets Groups Projects
Commit 134bc523 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'MindslayerCorrections' of...

Merge branch 'MindslayerCorrections' of http://git.net-core.org/housepet/t-engine4 into housepet/t-engine4-MindslayerCorrections

Conflicts:
	game/modules/tome/data/damage_types.lua
	game/modules/tome/data/timed_effects/mental.lua
parents cbfbd257 edb09a65
No related branches found
No related tags found
No related merge requests found
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