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

Browse Source

# Conflicts:
#	README.md
#	manifest.json

...

This commit is contained in:

SebastianMC 2022-12-18 20:10:33 +01:00

parent ec0049302b 747672e2f8

commit b35e985412

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