Claire f09f5b35f2 Merge commit 'd97d31cce6' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`		2024-05-04 16:12:51 +02:00
..
__mocks__	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
entrypoints	Merge commit 'f0c9cbaf3b' into glitch-soc/merge-upstream	2024-05-04 15:40:07 +02:00
flavours	[Glitch] Convert entrypoints/sign_up to Typescript	2024-05-04 15:51:58 +02:00
fonts	Merge commit '7f471e70c0' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
hooks
icons
images	Merge commit 'ffc5be4820' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
mastodon	Merge commit 'd97d31cce6' into glitch-soc/merge-upstream	2024-05-04 16:12:51 +02:00
material-icons	Merge commit '7201f99cf8' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
skins	Rename app/javascript/flavours/glitch/styles/index.scss to application.scss	2024-04-30 21:03:04 +02:00
styles	Merge commit 'd97d31cce6' into glitch-soc/merge-upstream	2024-05-04 16:12:51 +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