Commit f4df89dc authored by Michael Kamensky's avatar Michael Kamensky

Merge remote-tracking branch 'origin/ai-hints-rna' into ai-hints-rna

# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt
#	forge-gui/res/cardsfolder/upcoming/watchful_giant.txt
parents ffabf141 1e34fd27
Markdown is supported
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