Merge remote-tracking branch 'upstream/dev' into dev

Browse source

# Conflicts:
#	eslint.config.mjs
#	package.json
#	pnpm-lock.yaml
#	src/components/PluginSettings/index.tsx
#	src/plugins/imageZoom/index.tsx
#	src/plugins/messageLogger/index.tsx
#	src/plugins/pictureInPicture/index.tsx
#	src/plugins/serverInfo/GuildInfoModal.tsx
#	src/plugins/whoReacted/index.tsx

...

This commit is contained in:

thororen1234 2025-01-04 17:57:05 -05:00

parent c630fbba3d 7be3a40b7c

commit f8879cc801

114 changed files with 2092 additions and 893 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

0

patches/eslint@9.8.0.patch → patches/eslint@9.17.0.patch

Unescape Escape View file