mage/Mage
LevelX2 2429425fd2 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/cards/s/SalvageTrader.java
	Mage.Sets/src/mage/cards/t/ThermalDetonator.java
2018-08-15 10:51:21 +02:00
..
src Merge origin/master 2018-08-15 10:51:21 +02:00
manifest.mf
pom.xml XMage 1.4.30V0 2018-05-27 01:28:42 +02:00