Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.

2024-04-06 21:01:40 +02:00

..

__mocks__

…

core

Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream

2024-03-15 22:37:55 +01:00

flavours

[Glitch] Change new modals to allow vertical scrolling

2024-04-06 20:43:43 +02:00

fonts

…

hooks

…

icons

…

images

Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

2024-03-19 19:21:12 +01:00

mastodon

Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream

2024-04-06 21:01:40 +02:00

material-icons

Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream

2024-04-06 20:34:07 +02:00

packs

Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream

2024-03-15 22:37:55 +01:00

skins

…

styles

Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream

2024-04-06 20:34:07 +02:00

svg-icons

…

types

…