mastodon/app/javascript
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:49:42 +02:00
flavours [Glitch] Fix WebUI crash when listing server blocks and rationale is not available 2022-11-12 14:02:23 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
skins Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00