mage/Mage.Tests/src
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
..
frozen/org/mage/test/clientside rewrote singleton to enum where applicable 2017-03-14 16:32:47 +01:00
test Merge origin/master 2018-08-15 10:51:21 +02:00