mage/Mage.Client/src/main
LevelX2 52270a11c8 Merge origin/master
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
2018-06-10 01:13:30 +02:00
..
assembly Assembly fix. 2016-02-26 21:05:21 +03:00
java Merge origin/master 2018-06-10 01:13:30 +02:00
resources New plane (Panopticon) with 'PW to' ability checked 2018-05-31 23:14:56 +10:00