Merge origin/master

Browse source

Conflicts:
	Mage.Sets/src/mage/cards/c/CountervailingWinds.java

...

This commit is contained in:

emerald000 2017-07-04 13:05:36 -04:00

parent a219df9ebe 01d36d1819

commit f2febc9957

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 is not available