Merge remote-tracking branch 'Austin/filteredhands' into filteredhands

Browse Source

# Conflicts:
#	forge-game/src/main/java/forge/game/GameAction.java

...

This commit is contained in:

maustin

2018-05-26 23:32:35 +01:00

parent 70a82fbc45 c9a0058042

commit cb1debc8f4

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