Commit f17cc4a6 authored by imakunee's avatar imakunee

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
#	forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java
parents ffcc38d8 0cf9a3cf
Pipeline #462 failed with stage
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment