Skip to content
Snippets Groups Projects
Commit 30792e78 authored by James R.'s avatar James R.
Browse files

Merge branch 'flame-orb' into 'next' 

Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request !1220
parents 92625483 6c00a967
No related branches found
No related tags found
1 merge request!1220Flame Shield & Thunder Shield Adjustment (Closes #363)
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 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