Jeremy Kescher 004b22602b Merge branch 'emoji-reactions-base' into develop ... # Conflicts: # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/styles/components.scss		2024-02-24 11:08:13 +01:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
core	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
flavours	Merge branch 'emoji-reactions-base' into develop	2024-02-24 11:08:13 +01:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Port three new emoji reaction PR commits to Catstodon:	2024-01-28 02:22:43 +01:00
mastodon	Fix certain jsx files being in an old state in relation to the emoji reactions PR	2024-02-16 15:12:22 +01:00
material-icons	Merge branch 'glitch-soc' into develop	2024-02-06 22:58:23 +01:00
packs	Remove bypass and use use glitch-soc's theming system for inert.css	2024-01-15 22:16:26 +01:00
skins	Merge remote-tracking branch 'upstream/main' into develop	2022-12-09 14:47:08 +01:00
styles	Fix scss styles being in an old state	2024-02-16 15:03:21 +01:00
svg-icons	Use active variants for boost icons and increase icon size (#27924)	2024-01-24 12:37:43 +00:00
types	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00