Claire 705ea99136 Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream added an optional keyword argument where glitch-soc already had one for content-type.
  Added upstream's new option while keeping glitch-soc's.

2025-09-03 14:39:57 +02:00

..

__mocks__

Change icon SVG imports to use a default import (#28709)

2024-01-12 10:31:24 +00:00

entrypoints

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00

flavours

[Glitch] Change public self-quotes of private posts to be disallowed

2025-09-02 19:19:48 +02:00

fonts

Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream

2024-01-15 21:30:00 +01:00

icons

…

images

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

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

mastodon

Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream

2025-09-03 14:39:57 +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

Change design of lists in web UI (#32881)

2024-11-21 16:10:04 +00:00

testing

Add quotes_count to statuses stats (#35832)

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

types

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00