Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements

Browse Source

# Conflicts:
#	forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java

...

This commit is contained in:

maustin

2018-02-28 13:00:50 +00:00

parent 74d0e4c4dc 2b40b6e560

commit 61eef2b86f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available