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
KrystalSkull💖
12b33bf02f
Update FriendShip Ranks (#5) E ER
* Add files via upload

* Update index.tsx

* Update index.tsx

---------

Co-authored-by: thororen <78185467+thororen1234@users.noreply.github.com>
2024-06-13 22:20:45 -04:00
thororen1234
7da91d94d8 Updates 2024-06-01 14:32:22 -04:00