Commit graph

6 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
e38a70a25e Fix Broken Devs 2024-07-07 00:48:27 -04:00
thororen1234
783efc2f64 Fixes 2024-06-01 14:36:26 -04:00
thororen1234
7da91d94d8 Updates 2024-06-01 14:32:22 -04:00
thororen
44109d9979 Update To Devs and Badges Sys 2024-04-18 19:15:01 -04:00
thororen
ea7451bcdc forked!! 2024-04-17 14:29:47 -04:00