Rob Schnautz 249649dbaa Merge branch 'master' into 'deprecation-cleanup' ...

# Conflicts:
#   forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
#   forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java

2019-06-13 22:10:10 +00:00

..

src

Merge branch 'master' into 'deprecation-cleanup'

2019-06-13 22:10:10 +00:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2019-06-12 20:13:01 +00:00