Merge remote-tracking branch 'origin/master' into pr-2157

Browse Source

# Conflicts:
#	resources/custom_modules/mediaplayer.py

...

This commit is contained in:

Alex

2026-07-04 00:59:00 +02:00

parent e1411059ab 10add89802

commit ca9bfe5bfa

391 changed files with 30984 additions and 8499 deletions

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

resources/custom_modules/__pycache__/mediaplayer.cpython-314.pyc

BIN

Binary file not shown.