Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
#	forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java

...

This commit is contained in:

Jeremy Pelkala

2018-11-08 12:08:01 -05:00

parent ffcc38d8c4 0cf9a3cf40

commit f17cc4a620

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