mastodon-glitch/app/javascript
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
flavours [Glitch] Fix contrast of some elements with new brand colors 2022-06-21 09:00:43 +02:00
fonts
icons Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +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-06-28 11:11:18 +02:00