Ingmar Goudt ee71495a3f fix latest cards from master		2019-12-29 23:08:47 +01:00
..
main	fix latest cards from master	2019-12-29 23:08:47 +01:00
test/java/mage	fix conflicts	2019-12-29 19:28:20 +01:00