Merge remote-tracking branch 'origin/music-profiles' into music-profiles

Browse Source

# Conflicts:
#	forge-gui/res/languages/de-DE.properties

...

This commit is contained in:

Michael Kamensky

2021-11-08 07:05:39 +03:00

parent 37e965d9ee 7bc4c9eb05

commit 459f704521

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