mage/Mage.Sets
LevelX2 f1cb1ca780 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/cards/w/WhisperBloodLiturgist.java
	Mage.Sets/src/mage/cards/w/WildOnslaught.java
	Mage.Sets/src/mage/sets/Dominaria.java
2018-04-16 16:38:00 +02:00
..
src/mage Merge origin/master 2018-04-16 16:38:00 +02:00
pom.xml XMage 1.4.28V0 2018-03-10 20:42:29 +01:00