LevelX2 52270a11c8 Merge origin/master ... Conflicts: Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java		2018-06-10 01:13:30 +02:00
..
main	Merge origin/master	2018-06-10 01:13:30 +02:00
test/java/mage/client	Updated tests	2018-01-05 02:21:56 +04:00