Claire c96eebde37 Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5 ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.

2026-01-19 18:29:02 +01:00

..

contrast

fix: Fix unreadable text in high-contrast-mode (#35032)

2025-06-13 12:58:30 +00:00

entrypoints

Display quotes in email notifications (#36379)

2025-10-07 12:50:40 +00:00

fonts

Use @/ absolute paths instead of relative paths in CSS (#34806)

2025-05-26 07:27:44 +00:00

mastodon

Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5

2026-01-19 18:29:02 +01:00

mastodon-light

Add keyboard shortcut info banner to the boosting preferences section (#36506)

2025-10-16 14:53:23 +00:00

application.scss

Fix SASS deprecation notices (#34278)

2025-03-27 13:09:42 +00:00

contrast.scss

Fix SASS deprecation notices (#34278)

2025-03-27 13:09:42 +00:00

mastodon-light.scss

Fix SASS deprecation notices (#34278)

2025-03-27 13:09:42 +00:00

win95.scss

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

2025-05-25 14:36:51 +02:00