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
..
config	Added sending broadcast message to all users on server from Admin Console.	2012-01-25 19:13:27 +04:00
src/main/java/mage	Merge origin/master	2018-08-15 10:51:21 +02:00
pom.xml	XMage 1.4.30V0	2018-05-27 01:28:42 +02:00