mirror of
https://github.com/correl/mage.git
synced 2024-12-25 11:11:16 +00:00
2429425fd2
Conflicts: Mage.Sets/src/mage/cards/s/SalvageTrader.java Mage.Sets/src/mage/cards/t/ThermalDetonator.java |
||
---|---|---|
.. | ||
src | ||
manifest.mf | ||
pom.xml |