Merge remote-tracking branch 'Glamourer/main' into rework

Browse source

# Conflicts:
#	Glamourer/Designs/FixedDesigns.cs
#	Glamourer/GlamourerConfig.cs
#	Glamourer/Gui/InterfaceConfig.cs

...

This commit is contained in:

Ottermandias 2023-07-08 22:17:05 +02:00

parent 6a5242b8ab 1f4685f505

commit ee98d6b600

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 is not available