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 9765d2b3f8 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/environments/production.rb`:
  Upstream changed headers, and we have different ones.
  Ported upstream's change.
2023-01-10 09:39:15 +01:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
flavours [Glitch] Add dropdown menu item to open admin interface for remote domains 2023-01-05 16:31:20 +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-12-15 20:25:25 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 09:39:15 +01:00
packs Fix “Add new domain block” button using last submitted instead of current search value (#22485) 2023-01-05 13:42:38 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00