Merge remote-tracking branch 'origin/ai-torgaar' into ai-torgaar

Browse Source

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

...

This commit is contained in:

Agetian

2018-04-18 17:18:49 +03:00

parent dcacdf65ce b8deb244ca

commit f83e097769

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