Merge origin/master

Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
This commit is contained in:
LevelX2 2017-01-06 21:57:18 +01:00
commit 7ec9394a83
23 changed files with 1349 additions and 294 deletions

View file

@ -7,7 +7,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author BetaSteward
* @author LevelX
*/
public class EpharaGodOfThePolisTest extends CardTestPlayerBase {