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

Browse Source

# Conflicts:
#	forge-gui/res/editions/War of the Spark.txt

...

This commit is contained in:

maustin

2019-04-14 22:35:38 +01:00

parent 974ce4c724 cbf867106d

commit 9afb43d25a

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