Michael Kamensky 4ae50b56b3 Merge branch 'oath-of-nissa-fix' into 'master' ...

Conversion matrices weren't setup properly.

See merge request core-developers/forge!3298

2020-10-28 04:27:19 +00:00

..

main/java/forge

Merge branch 'oath-of-nissa-fix' into 'master'

2020-10-28 04:27:19 +00:00

test/java

Fixes some compile errors in Eclipse due to empty folders.

2018-04-17 15:50:53 -07:00