Merge remote-tracking branch 'core/master'

Browse Source

# Conflicts:
#	forge-gui-mobile/src/forge/adventure/scene/RewardScene.java

...

This commit is contained in:

Anthony Calosa

2022-02-26 12:05:33 +08:00

parent 9c72cd2279 e03811c803

commit 373be68a76

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