Jeremy Kescher d1856ea48d Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/initial_state.js		2024-05-22 23:56:46 +02:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
entrypoints	Merge commit 'b7902225d6' into glitch-soc/merge-upstream	2024-05-04 16:28:30 +02:00
flavours	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-22 23:56:46 +02:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks
icons
images	Merge branch 'glitch-soc' into develop	2024-03-20 22:59:13 +01:00
mastodon	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-22 23:56:46 +02:00
material-icons	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
skins	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
styles	Merge commit 'cd0c547936' into glitch-soc/merge-upstream	2024-05-21 17:45:21 +02: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