Files
mastodon-sakyey/app/javascript/mastodon
Claire 323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
2025-10-16 19:23:29 +02:00
..
2025-10-08 15:07:01 +00:00
2025-10-08 11:11:25 +00:00
2025-08-18 16:52:28 +00:00
2025-10-08 11:11:25 +00:00
2025-07-31 17:30:14 +00:00
2024-04-03 18:05:39 +00:00