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

..

custom_emoji_parser.rb

Add support for editing for published statuses (#16697)

2022-01-19 22:37:27 +01:00

media_attachment_parser.rb

Fix missing , (#18660)

2022-06-23 23:10:03 +02:00

poll_parser.rb

Add support for editing for published statuses (#16697)

2022-01-19 22:37:27 +01:00

status_parser.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-19 23:52:48 +01:00