Commit graph

3 commits

Author SHA1 Message Date
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
thororen1234
1e6cfb8bd2 Fix Some Names 2024-08-18 00:24:00 -04:00
thororen1234
92fe7335fb BypassDND -> BypassStatus 2024-08-18 00:20:36 -04:00