Merge remote-tracking branch 'origin/master'

Browse source

# Conflicts:
#	Mage.Sets/src/mage/cards/c/CephalidSnitch.java
#	Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java

...

This commit is contained in:

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

parent e2a5561a87 c644e37ff9

commit 1ea68e32c4

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