Claire b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.

2025-09-29 18:41:46 +02:00

..

__mocks__

…

config

[Glitch] Adds new HTMLBlock component

2025-09-27 22:05:42 +02:00

entrypoints

Update labels in Posting defaults settings (#36084)

2025-09-11 14:04:15 +00:00

flavours

[Glitch] Update "Follow" button labels

2025-09-27 22:05:42 +02:00

fonts

…

icons

…

images

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

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

mastodon

Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream

2025-09-29 18:41:46 +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 '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream

2025-09-27 21:29:19 +02:00

svg-icons

…

testing

Add quotes_count to statuses stats (#35832)

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

types

…