LevelX2 f95b0e6c0a Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/RivalsOfIxalan.java		2018-01-05 23:41:30 +01:00
..
java/mage	Merge origin/master	2018-01-05 23:41:30 +01:00
proto