LevelX2 d0fd325bfa Merge origin/master ... Conflicts: Mage.Sets/src/mage/cards/c/Cacophodon.java Mage.Sets/src/mage/cards/g/GiltgroveStalker.java Mage.Sets/src/mage/cards/h/HardyVeteran.java Mage.Sets/src/mage/sets/RivalsOfIxalan.java		2018-01-06 12:48:46 +01:00
..
src/mage	Merge origin/master	2018-01-06 12:48:46 +01:00
pom.xml