Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.

2024-11-03 20:51:58 +01:00

..

__mocks__

…

entrypoints

Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream

2024-10-26 13:38:07 +02:00

flavours

Fix missing CSS for CW margins (#2891)

2024-10-27 21:08:59 +01:00

fonts

…

hooks

Update directory page options to use URL params (#31977)

2024-09-19 15:34:08 +00:00

icons

…

images

Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream

2024-10-26 13:38:07 +02:00

mastodon

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

2024-11-03 20:51:58 +01:00

material-icons

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

2024-10-06 16:07:58 +02:00

skins

…

styles

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

2024-11-03 20:51:58 +01:00

svg-icons

Change zoom icon in web UI (#29683)

2024-09-20 09:42:02 +00:00

types

…