Commit graph

4 commits

Author SHA1 Message Date
thororen1234
90d946e7c6 Fixes 2025-01-22 21:22:25 -05:00
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
Prince527
a8e4d68705
Update index.tsx (#15) 2024-07-18 18:21:50 -04:00
thororen1234
ee6a447c6f Im done adding stuff 2024-07-18 03:07:01 -04:00