Merge commit '6af09943682f52de7b3dca92ecd6f096b5ceb3c0' into HEAD

Browse source

Conflicts:
	Mage.Sets/src/mage/cards/c/ChainOfAcid.java
	Mage.Sets/src/mage/cards/c/ChainOfSmog.java

...

This commit is contained in:

Evan Kranzler 2017-08-09 20:51:39 -04:00

parent 6af0994368 6af0994368

commit f7ba430299

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available