Evan Kranzler 7cea71d6f2 Merge branch 'master' into master		2019-04-20 08:52:33 -04:00
..
java/mage	Merge branch 'master' into master	2019-04-20 08:52:33 -04:00
proto
resources/ratings	Refactor card ratings, fixed rare error exception "comparison method violates its general contract" (different ratings in same card);	2019-02-01 17:41:29 +04:00