Claire d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.

2025-09-02 19:07:51 +02:00

..

__mocks__

…

entrypoints

…

flavours

New Crowdin Translations (automated) (#3103)

2025-08-31 16:16:20 +02:00

fonts

…

icons

…

images

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

2025-08-06 22:02:55 +02:00

mastodon

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

material-icons

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

skins

Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream

2025-06-12 20:32:25 +02:00

styles

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

svg-icons

…

testing

Add quotes_count to statuses stats (#35832)

2025-08-25 12:21:28 +00:00

types

…