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
..
components	Reapply "MLEnhanced Update"	2024-11-18 22:19:10 -05:00
native	Reapply "MLEnhanced Update"	2024-11-18 22:19:10 -05:00
utils	Merge remote-tracking branch 'upstream/dev' into dev	2025-01-04 17:57:05 -05:00
db.ts	Fix Tests	2024-11-19 17:08:13 -05:00
index.tsx	Merge remote-tracking branch 'upstream/dev' into dev	2025-01-04 17:57:05 -05:00
LoggedMessageManager.ts	Reapply "MLEnhanced Update"	2024-11-18 22:19:10 -05:00
settings.tsx	Reapply "MLEnhanced Update"	2024-11-18 22:19:10 -05:00
styles.css	Reapply "MLEnhanced Update"	2024-11-18 22:19:10 -05:00
types.ts	Reapply "MLEnhanced Update"	2024-11-18 22:19:10 -05:00