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

Browse Source

# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt
#	forge-gui/res/cardsfolder/upcoming/watchful_giant.txt

...

This commit is contained in:

Agetian

2019-01-19 10:27:27 +03:00

parent ffabf14192 1e34fd27fe

commit f4df89dca8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available