Ryan Wiedemann 3d51a6e962 Merge branch 'master' into 'start_trigger_run_params_refactor' ...

# Conflicts:
#   forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java

2019-09-07 23:36:05 +00:00

..

src

Merge branch 'master' into 'start_trigger_run_params_refactor'

2019-09-07 23:36:05 +00:00

pom.xml

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

2019-09-04 01:51:10 +00:00