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

Browse Source

# Conflicts:
#	forge-gui/res/editions/Guilds of Ravnica.txt

...

This commit is contained in:

maustin

2018-09-15 22:07:31 +01:00

parent 48827f34ee b7b302c4f9

commit 9d9557009c

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