Merge remote-tracking branch 'origin/main' into dev-1.8.0

Browse Source

# Conflicts:
#	.github/workflows/docker.yml
#	.github/workflows/electron.yml

...

This commit is contained in:

LukeGus committed 2025-11-05 10:34:23 -06:00

2 parents f5929953ca dc29646a39

commit 2215ce6c76

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