Merge remote-tracking branch 'origin/master'

Browse source

# Conflicts:
#	Mage.Sets/src/mage/cards/c/CephalidSnitch.java

...

This commit is contained in:

Thomas Contis 2018-04-28 22:19:19 -04:00

parent 4ec5563bc6 c96d63c734

commit c644e37ff9

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