Skip to content
Snippets Groups Projects
Commit f1e45677 authored by Recaiden's avatar Recaiden
Browse files

Merge remote-tracking branch 'upstream/master' 

# Conflicts:
#	game/engines/default/engine/interface/GameTargeting.lua
#	game/modules/tome/data/talents/techniques/combat-techniques.lua
parents 3fc3ec47 4dec3841
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 55 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment