thororen1234
|
f8879cc801
|
Merge remote-tracking branch 'upstream/dev' into dev
# 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
|
2025-01-04 17:57:05 -05:00 |
|