Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
core	Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream	2024-02-24 15:35:56 +01:00
flavours	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +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	Merge branch 'glitch-soc' into develop	2024-02-24 17:51:18 +01:00
mastodon	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
material-icons	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
packs	Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer	2024-02-22 20:58:41 +01:00
skins	Merge remote-tracking branch 'upstream/main' into develop	2022-12-09 14:47:08 +01:00
styles	Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +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