Merge remote-tracking branch 'Austin/guildofravnica' into guildofravnica

Browse Source

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

...

This commit is contained in:

maustin

2018-09-03 09:06:45 +01:00

parent 6540153a53 35c52e0e61

commit d0cea5151e

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