mage/Mage.Sets
LevelX2 21f151042c Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
2018-01-03 13:04:23 +01:00
..
src/mage Merge origin/master 2018-01-03 13:04:23 +01:00
pom.xml