Merge remote-tracking branch 'upstream/main' into feature/checkbox-config

Browse Source

# Conflicts:
#	modules/config.py
#	webui.py

...

This commit is contained in:

Manuel Schmid 2024-07-27 23:06:03 +02:00

parent 8cc246a51d 3f25b885a7

commit 4e1eaa907f

No known key found for this signature in database

GPG Key ID: 32C4F7569B40B84B

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available