This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
Claire 3869daef09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
flavours Remove “I don't like it” option from report modal 2022-05-01 21:58:20 +02:00
fonts
images Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-05-03 10:16:49 +02:00
packs Pre-fill domain block/allow domain from search filter (#18172) 2022-04-29 00:24:44 +02: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-05-03 10:16:49 +02:00