Merge remote-tracking branch 'upstream/HEAD' into merge-upstream-1

Browse Source

# Conflicts:
#	manifest.json

...

This commit is contained in:

SebastianMC 2024-01-24 20:18:29 +01:00

parent 3000da4edc e60294b950

commit 45e5f3c3c7

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